edytor 2.0.0 → 4.0.0

package/dist/cloudflare/room/context.d.ts

@@ -28,7 +28,7 @@ export declare const crdt: {
     Awareness: typeof import("../../index.js").Awareness;
     doc: {
         SCHEMA: {
-            readonly version: 6;
+            readonly version: 10;
             readonly name: "edytor-doc";
             readonly roots: {
                 readonly registry: "blocks";
@@ -39,7 +39,7 @@ export declare const crdt: {
                 readonly schema: "schema";
             };
         };
-        SCHEMA_VERSION: 6;
+        SCHEMA_VERSION: 10;
         SCHEMA_NAME: "edytor-doc";
         META_KEY: "meta";
         init: (doc: E.EngineDoc, opts?: {
@@ -103,29 +103,30 @@ export declare const crdt: {
                 blockNodeOf: (doc: E.EngineDoc, id: import("../../index.js").BlockId) => E.EngineNode | null;
                 liveNodeOf: (doc: E.EngineDoc, id: import("../../index.js").BlockId) => E.EngineNode | null;
                 isLive: (doc: E.EngineDoc, id: import("../../index.js").BlockId) => boolean;
-                candidatesOf: (node: E.EngineNode) => import("../../crdt/placement/model.js").PlacementCand[];
                 view: (doc: E.EngineDoc) => import("../../crdt/placement/model.js").ModelView;
-                resolvePlacements: (blocks: Map<import("../../index.js").BlockId, import("../../crdt/placement/model.js").BlockRec>, ownerOf?: (b: import("../../index.js").BlockId) => import("../../crdt/text/model.js").Owner) => Map<import("../../index.js").BlockId, import("../../crdt/placement/model.js").ResolvedPlacement>;
                 childrenIndex: (placements: Map<import("../../index.js").BlockId, import("../../crdt/placement/model.js").ResolvedPlacement>, own: import("../../crdt/placement/model.js").DisplayOwnership) => Map<import("../../index.js").BlockId | null, import("../../crdt/placement/model.js").ChildSlot[]>;
                 positionInView: (v: import("../../crdt/placement/model.js").ModelView, id: import("../../index.js").BlockId) => import("../../index.js").Destination | null;
                 buildInline: (atom: import("../../index.js").InlineSpec) => E.EngineNode;
                 isSelfOrDescendant: (placements: Map<import("../../index.js").BlockId, import("../../crdt/placement/model.js").ResolvedPlacement>, own: import("../../crdt/text/model.js").Ownership, id: import("../../index.js").BlockId, maybeAncestor: import("../../index.js").BlockId) => boolean;
-                ranksAt: (siblings: readonly {
-                    rank: string;
-                }[], index: number, count: number, clientId: number, rand?: () => number, run?: boolean) => string[];
-                writePlacement: (doc: E.EngineDoc, node: E.EngineNode, p: import("../../index.js").BlockId | null, r: string) => void;
+                placeBlocks: (doc: E.EngineDoc, v: import("../../crdt/placement/model.js").ModelView, parent: import("../../index.js").BlockId | null, left: import("../../index.js").BlockId | null, right: import("../../index.js").BlockId | null, slots: readonly import("../../crdt/placement/slots.js").BlockSlot[] | null, moved?: readonly number[] | null, side?: number, part?: number, at?: import("../../crdt/placement/slots.js").Unit | null) => void;
+                moveBlocksTo: (doc: E.EngineDoc, v: import("../../crdt/placement/model.js").ModelView, ids: readonly import("../../index.js").BlockId[], parent: import("../../index.js").BlockId | null, index: number, side?: number, part?: number, at?: import("../../index.js").BlockId | null) => void;
+                insertSpecsAt: (doc: E.EngineDoc, v: import("../../crdt/placement/model.js").ModelView, parent: import("../../index.js").BlockId | null, index: number, specs: readonly import("../../index.js").BlockSpec[], split?: import("../../crdt/placement/slots.js").Unit | null) => void;
                 withdrawOnUndo: (doc: E.EngineDoc) => (item: E.EngineItemRef, stackItem: {
                     inserts: {
                         has(client: number, clock: number): boolean;
                     };
                 }) => boolean;
-                materializeSpec: (doc: E.EngineDoc, sp: import("../../index.js").BlockSpec, parent: import("../../index.js").BlockId | null, rank: string) => void;
                 collides: (doc: E.EngineDoc, specs: readonly import("../../index.js").BlockSpec[]) => boolean;
-                writeSplit: (doc: E.EngineDoc, id: import("../../index.js").BlockId, offset: number, newId: import("../../index.js").BlockId, tail: import("../../index.js").SplitTail, place: import("../../crdt/placement/model.js").PlacementValue) => void;
+                writeSplit: (doc: E.EngineDoc, id: import("../../index.js").BlockId, offset: number, newId: import("../../index.js").BlockId, tail: import("../../index.js").SplitTail, parent: import("../../index.js").BlockId | null, index: number) => import("../../crdt/placement/slots.js").Unit;
                 ownText: (doc: E.EngineDoc, id: import("../../index.js").BlockId) => {
                     from: unknown;
                     to: number;
                 };
+                recordsOf: (doc: E.EngineDoc, node: E.EngineNode, v?: import("../../crdt/placement/model.js").ModelView) => {
+                    item: import("../../crdt/placement/slots.js").SeqItem;
+                    stamp: import("../../crdt/placement/slots.js").Stamp;
+                    wins: boolean;
+                }[];
                 insertBlocks: (doc: E.EngineDoc, dest: import("../../index.js").Destination, specs: import("../../index.js").BlockSpec[]) => boolean;
                 insertBlock: (doc: E.EngineDoc, dest: import("../../index.js").Destination, spec: import("../../index.js").BlockSpec) => boolean;
                 restoreBlocks: (doc: E.EngineDoc, specs: import("../../index.js").BlockSpec[]) => void;
@@ -157,8 +158,8 @@ export declare const crdt: {
                     at: number;
                     node: E.EngineNode;
                 } | null;
-                splitAt: (blocks: ReadonlyMap<import("../../crdt/text/model.js").BlockId, import("../../crdt/text/model.js").TextBlockRec>, own: import("../../crdt/text/model.js").Ownership, b: import("../../crdt/text/model.js").BlockId, offset: number, newId: import("../../crdt/text/model.js").BlockId, n: number) => import("../../crdt/text/model.js").MergeClaim[];
-                claimInto: (blocks: ReadonlyMap<import("../../crdt/text/model.js").BlockId, import("../../crdt/text/model.js").TextBlockRec>, own: Pick<import("../../crdt/text/model.js").Ownership, "streamOf">, from: import("../../crdt/text/model.js").BlockId, into: import("../../crdt/text/model.js").BlockId) => void;
+                splitAt: (doc: E.EngineDoc, blocks: ReadonlyMap<import("../../crdt/text/model.js").BlockId, import("../../crdt/text/model.js").TextBlockRec>, own: import("../../crdt/text/model.js").Ownership, b: import("../../crdt/text/model.js").BlockId, offset: number, newId: import("../../crdt/text/model.js").BlockId, n: number) => void;
+                claimInto: (own: Pick<import("../../crdt/text/model.js").Ownership, "streamOf">, from: import("../../crdt/text/model.js").BlockId, into: import("../../crdt/text/model.js").BlockId) => void;
                 ownText: (doc: E.EngineDoc, rec: import("../../crdt/text/model.js").TextBlockRec) => {
                     from: unknown;
                     to: number;
@@ -178,7 +179,7 @@ export declare const crdt: {
                 keep?: boolean;
                 after?: readonly import("../../index.js").BlockSpec[];
             } | undefined) => import("../../index.js").OpResult;
-            placeBeside: (ids: readonly string[], target: string, side: "right" | "left", kind?: string | undefined) => import("../../index.js").OpResult;
+            placeBeside: (ids: readonly string[], target: string, side: "left" | "right", kind?: string | undefined) => import("../../index.js").OpResult;
             wrapInLayout: (ids: readonly string[], kind?: string | undefined, columns?: number | undefined) => import("../../index.js").OpResult;
             splitBlock: (id: string, offset: number, newId: string, tail?: import("../../index.js").SplitTail | undefined) => import("../../index.js").OpResult;
             mergeBlocks: (fromId: string, intoId: string) => import("../../index.js").OpResult;
@@ -301,11 +302,10 @@ export declare const crdt: {
             onChange: (cb: (change: import("../../index.js").DocChange) => void) => (() => void);
         };
         newDoc: (opts?: ConstructorParameters<E.EngineApi["Doc"]>[0]) => YDoc;
-        keepCopies: (doc: E.EngineDoc) => void;
         purge: (doc: E.EngineDoc, facade: {
             model: import("../../crdt/placement/model.js").PlacementModel;
             text: import("../../crdt/text/model.js").TextEngine;
-        }, horizon: import("../../crdt/purge.js").Horizon) => import("../index.js").PurgeReport;
+        }, horizon: import("../../crdt/purge.js").Horizon | null) => import("../index.js").PurgeReport;
         horizonOf: (doc: E.EngineDoc) => import("../../crdt/purge.js").Horizon | null;
         restoreTo: <Plan>(doc: E.EngineDoc, facade: import("../../crdt/restore.js").RestoreFacade<Plan>, json: JSONDoc) => import("../../crdt/restore.js").RestoreReport;
         model: {
@@ -314,29 +314,30 @@ export declare const crdt: {
             blockNodeOf: (doc: E.EngineDoc, id: import("../../index.js").BlockId) => E.EngineNode | null;
             liveNodeOf: (doc: E.EngineDoc, id: import("../../index.js").BlockId) => E.EngineNode | null;
             isLive: (doc: E.EngineDoc, id: import("../../index.js").BlockId) => boolean;
-            candidatesOf: (node: E.EngineNode) => import("../../crdt/placement/model.js").PlacementCand[];
             view: (doc: E.EngineDoc) => import("../../crdt/placement/model.js").ModelView;
-            resolvePlacements: (blocks: Map<import("../../index.js").BlockId, import("../../crdt/placement/model.js").BlockRec>, ownerOf?: (b: import("../../index.js").BlockId) => import("../../crdt/text/model.js").Owner) => Map<import("../../index.js").BlockId, import("../../crdt/placement/model.js").ResolvedPlacement>;
             childrenIndex: (placements: Map<import("../../index.js").BlockId, import("../../crdt/placement/model.js").ResolvedPlacement>, own: import("../../crdt/placement/model.js").DisplayOwnership) => Map<import("../../index.js").BlockId | null, import("../../crdt/placement/model.js").ChildSlot[]>;
             positionInView: (v: import("../../crdt/placement/model.js").ModelView, id: import("../../index.js").BlockId) => import("../../index.js").Destination | null;
             buildInline: (atom: import("../../index.js").InlineSpec) => E.EngineNode;
             isSelfOrDescendant: (placements: Map<import("../../index.js").BlockId, import("../../crdt/placement/model.js").ResolvedPlacement>, own: import("../../crdt/text/model.js").Ownership, id: import("../../index.js").BlockId, maybeAncestor: import("../../index.js").BlockId) => boolean;
-            ranksAt: (siblings: readonly {
-                rank: string;
-            }[], index: number, count: number, clientId: number, rand?: () => number, run?: boolean) => string[];
-            writePlacement: (doc: E.EngineDoc, node: E.EngineNode, p: import("../../index.js").BlockId | null, r: string) => void;
+            placeBlocks: (doc: E.EngineDoc, v: import("../../crdt/placement/model.js").ModelView, parent: import("../../index.js").BlockId | null, left: import("../../index.js").BlockId | null, right: import("../../index.js").BlockId | null, slots: readonly import("../../crdt/placement/slots.js").BlockSlot[] | null, moved?: readonly number[] | null, side?: number, part?: number, at?: import("../../crdt/placement/slots.js").Unit | null) => void;
+            moveBlocksTo: (doc: E.EngineDoc, v: import("../../crdt/placement/model.js").ModelView, ids: readonly import("../../index.js").BlockId[], parent: import("../../index.js").BlockId | null, index: number, side?: number, part?: number, at?: import("../../index.js").BlockId | null) => void;
+            insertSpecsAt: (doc: E.EngineDoc, v: import("../../crdt/placement/model.js").ModelView, parent: import("../../index.js").BlockId | null, index: number, specs: readonly import("../../index.js").BlockSpec[], split?: import("../../crdt/placement/slots.js").Unit | null) => void;
             withdrawOnUndo: (doc: E.EngineDoc) => (item: E.EngineItemRef, stackItem: {
                 inserts: {
                     has(client: number, clock: number): boolean;
                 };
             }) => boolean;
-            materializeSpec: (doc: E.EngineDoc, sp: import("../../index.js").BlockSpec, parent: import("../../index.js").BlockId | null, rank: string) => void;
             collides: (doc: E.EngineDoc, specs: readonly import("../../index.js").BlockSpec[]) => boolean;
-            writeSplit: (doc: E.EngineDoc, id: import("../../index.js").BlockId, offset: number, newId: import("../../index.js").BlockId, tail: import("../../index.js").SplitTail, place: import("../../crdt/placement/model.js").PlacementValue) => void;
+            writeSplit: (doc: E.EngineDoc, id: import("../../index.js").BlockId, offset: number, newId: import("../../index.js").BlockId, tail: import("../../index.js").SplitTail, parent: import("../../index.js").BlockId | null, index: number) => import("../../crdt/placement/slots.js").Unit;
             ownText: (doc: E.EngineDoc, id: import("../../index.js").BlockId) => {
                 from: unknown;
                 to: number;
             };
+            recordsOf: (doc: E.EngineDoc, node: E.EngineNode, v?: import("../../crdt/placement/model.js").ModelView) => {
+                item: import("../../crdt/placement/slots.js").SeqItem;
+                stamp: import("../../crdt/placement/slots.js").Stamp;
+                wins: boolean;
+            }[];
             insertBlocks: (doc: E.EngineDoc, dest: import("../../index.js").Destination, specs: import("../../index.js").BlockSpec[]) => boolean;
             insertBlock: (doc: E.EngineDoc, dest: import("../../index.js").Destination, spec: import("../../index.js").BlockSpec) => boolean;
             restoreBlocks: (doc: E.EngineDoc, specs: import("../../index.js").BlockSpec[]) => void;
@@ -368,8 +369,8 @@ export declare const crdt: {
                 at: number;
                 node: E.EngineNode;
             } | null;
-            splitAt: (blocks: ReadonlyMap<import("../../crdt/text/model.js").BlockId, import("../../crdt/text/model.js").TextBlockRec>, own: import("../../crdt/text/model.js").Ownership, b: import("../../crdt/text/model.js").BlockId, offset: number, newId: import("../../crdt/text/model.js").BlockId, n: number) => import("../../crdt/text/model.js").MergeClaim[];
-            claimInto: (blocks: ReadonlyMap<import("../../crdt/text/model.js").BlockId, import("../../crdt/text/model.js").TextBlockRec>, own: Pick<import("../../crdt/text/model.js").Ownership, "streamOf">, from: import("../../crdt/text/model.js").BlockId, into: import("../../crdt/text/model.js").BlockId) => void;
+            splitAt: (doc: E.EngineDoc, blocks: ReadonlyMap<import("../../crdt/text/model.js").BlockId, import("../../crdt/text/model.js").TextBlockRec>, own: import("../../crdt/text/model.js").Ownership, b: import("../../crdt/text/model.js").BlockId, offset: number, newId: import("../../crdt/text/model.js").BlockId, n: number) => void;
+            claimInto: (own: Pick<import("../../crdt/text/model.js").Ownership, "streamOf">, from: import("../../crdt/text/model.js").BlockId, into: import("../../crdt/text/model.js").BlockId) => void;
             ownText: (doc: E.EngineDoc, rec: import("../../crdt/text/model.js").TextBlockRec) => {
                 from: unknown;
                 to: number;
@@ -536,7 +537,7 @@ export declare const crdt: {
                 off<NAME extends "refused" | "status" | "failed" | "schema-mismatch" | "message-error" | "protocol-mismatch" | "synced" | "connection-close" | "connection-error" | "saved" | "permission-denied" | "expired" | "unreachable">(name: NAME, f: E.WebsocketProviderEvents[NAME]): void;
             };
         };
-        watchComments: (server: string, roomName: string, listener: (message: E.CommentMessage) => void) => (() => void);
+        watchComments: (server: string | null, roomName: string, listener: (message: E.CommentMessage) => void) => (() => void);
         storeState: (idbPersistence: {
             db: IDBDatabase | null;
             name: string;
@@ -691,9 +692,9 @@ export declare class RoomContext {
             emptied: number;
             marks: number;
             records: number;
-            candidates: number;
             claims: number;
             merged: number;
+            released: number;
         };
         since: number;
     };

package/dist/cloudflare/room/context.js

@@ -51,9 +51,9 @@ const counters = () => ({
         emptied: 0,
         marks: 0,
         records: 0,
-        candidates: 0,
         claims: 0,
-        merged: 0
+        merged: 0,
+        released: 0
     },
     since: Date.now()
 });

package/dist/cloudflare/room/purge.d.ts

@@ -1,4 +1,4 @@
-import type { PurgeReport } from '../../crdt/purge.js';
+import { type PurgeReport } from '../../crdt/purge.js';
 import { type RoomContext } from './context.js';
 export declare class RoomPurge {
     #private;
@@ -8,8 +8,11 @@ export declare class RoomPurge {
     get days(): number | null;
     /** A change was stored at `at`: the purge tick runs a day later at the latest. */
     noteChange(at: number): void;
-    /** The purge task (`AttachedDocument.purge`). */
+    /**
+     * The purge task (`AttachedDocument.purge`): its report, `horizon` the
+     * epoch it purged to (`null`: only ended sessions' deletes).
+     */
     tick(): (PurgeReport & {
-        horizon: number;
+        horizon: number | null;
     }) | null;
 }

package/dist/cloudflare/room/purge.js

@@ -1,10 +1,13 @@
 /**
  * The purge (`room.purge.*`): the daily tick records an epoch (the state
  * vector) when the document changed, and purges what was deleted before
- * the horizon — the newest epoch at least `purgeAfterDays` old — as the
- * room's own transaction (`crdt/purge.ts`), then compacts.
+ * the horizon — the newest epoch at least `purgeAfterDays` old — and what
+ * the sessions whose history ended deleted (`hist.release.end`), as the
+ * room's own transaction (`crdt/purge.ts`), then compacts. With no epoch
+ * due, a tick still purges the ended sessions' deletes.
  */
 import { Y } from '../../crdt/engine.js';
+import { releasesOf } from '../../crdt/purge.js';
 import { asEngineDoc } from '../../crdt/structs.js';
 import { PURGE_ORIGIN, noTimers } from './shared.js';
 import { DEFAULT_RETENTION_DAYS } from '../history.js';
@@ -27,7 +30,10 @@ export class RoomPurge {
         if (this.days !== null)
             this.room.scheduler.schedule('purge', at + DAY, 'earlier');
     }
-    /** The purge task (`AttachedDocument.purge`). */
+    /**
+     * The purge task (`AttachedDocument.purge`): its report, `horizon` the
+     * epoch it purged to (`null`: only ended sessions' deletes).
+     */
     tick() {
         const room = this.room;
         const { scheduler, sql, tables } = room;
@@ -61,6 +67,10 @@ export class RoomPurge {
             if (horizon !== undefined && horizon.at > purged) {
                 result = this.#purgeTo({ at: horizon.at, sv: new Uint8Array(horizon.sv) });
             }
+            else if (releasesOf(asEngineDoc(doc)).size > 0) {
+                // No epoch is due: the ended sessions' deletes go all the same.
+                result = this.#purgeTo(null);
+            }
             // The next epoch to pass the horizon, or the next change, arms it again.
             const next = sql
                 .exec(`SELECT at FROM ${tables.epochs} WHERE at > ? ORDER BY at LIMIT 1`, Math.max(purged, horizon?.at ?? -1))
@@ -72,18 +82,27 @@ export class RoomPurge {
             return result;
         });
     }
-    /** Purge what was deleted before `horizon`, as the room's own transaction, then compact. */
+    /**
+     * Purge what was deleted before `horizon` and what ended sessions deleted
+     * (`null`: only those), as the room's own transaction, then compact. A
+     * purge of ended sessions' deletes that finds none left compacts nothing
+     * and reports `null`.
+     */
     #purgeTo(horizon) {
         const room = this.room;
         const doc = room.requireDoc();
         // A restore past the horizon can no longer be undone (`room.history.undo`).
-        room.history.expireRestore(horizon.at);
+        if (horizon !== null)
+            room.history.expireRestore(horizon.at);
         room.history.closeSlotIfPast();
         let report;
+        let wrote = true;
         room.transacting = true;
         try {
             room.facade.transact(() => {
                 report = crdt.doc.purge(asEngineDoc(doc), room.facade, horizon);
+                const tr = asEngineDoc(doc)._transaction;
+                wrote = !tr.insertSet.isEmpty() || !tr.deleteSet.isEmpty();
             }, PURGE_ORIGIN);
         }
         finally {
@@ -94,30 +113,36 @@ export class RoomPurge {
             room.storage.heal();
             throw error;
         }
-        room.ctx.storage.transactionSync(() => {
-            room.sql.exec(`INSERT OR REPLACE INTO ${room.tables.meta} (key, value) VALUES ('purged', ?)`, horizon.at);
-            room.sql.exec(`DELETE FROM ${room.tables.epochs} WHERE at < ?`, horizon.at);
-        });
-        room.storage.compact();
-        const counters = room.counters.purge;
-        counters.runs++;
-        counters.horizon = horizon.at;
-        for (const key of [
+        if (horizon !== null)
+            room.ctx.storage.transactionSync(() => {
+                room.sql.exec(`INSERT OR REPLACE INTO ${room.tables.meta} (key, value) VALUES ('purged', ?)`, horizon.at);
+                room.sql.exec(`DELETE FROM ${room.tables.epochs} WHERE at < ?`, horizon.at);
+            });
+        const keys = [
             'removed',
             'emptied',
             'marks',
             'records',
-            'candidates',
             'claims',
-            'merged'
-        ])
+            'merged',
+            'released'
+        ];
+        // Nothing an ended session deleted was left: no compaction, no run.
+        if (horizon === null && !wrote)
+            return null;
+        room.storage.compact();
+        const counters = room.counters.purge;
+        counters.runs++;
+        if (horizon !== null)
+            counters.horizon = horizon.at;
+        for (const key of keys)
             counters[key] += report[key];
         room.log({
             edytor: 'purge',
-            horizon: horizon.at,
+            horizon: horizon?.at ?? null,
             bytes: room.counters.compaction.lastBytes,
             ...report
         });
-        return { ...report, horizon: horizon.at };
+        return { ...report, horizon: horizon?.at ?? null };
     }
 }

package/dist/cloudflare/room/updates.d.ts

@@ -77,10 +77,9 @@ export declare const heldDeletes: (doc: YDoc, ds: Decoded["ds"]) => Decoded["ds"
 export declare const withoutPending: <T>(doc: YDoc, read: () => T) => T;
 /**
  * The live document as one update: its healed state — the engine
- * merged what each keystroke wrote and collected deleted content, sparing
- * the text a replica may copy again (`keepCopies`) —, without what
- * waits (`withoutPending`). Memory never runs ahead of storage, so it
- * holds exactly what the stored records hold, collected.
+ * merged what each keystroke wrote and collected deleted content —,
+ * without what waits (`withoutPending`). Memory never runs ahead of
+ * storage, so it holds exactly what the stored records hold, collected.
  */
 export declare const liveState: (doc: YDoc) => Uint8Array;
 /** A fresh room document (`prepareRoomDoc`'s collection rules). */

package/dist/cloudflare/room/updates.js

@@ -5,7 +5,7 @@
  */
 import * as encoding from 'lib0-v14/encoding';
 import { Y } from '../../crdt/engine.js';
-import { asEngineDoc, keepFromCollection, structAt as storeStructAt } from '../../crdt/structs.js';
+import { keepFromCollection, structAt as storeStructAt } from '../../crdt/structs.js';
 import { ROOM_ORIGIN } from './shared.js';
 import { crdt } from './context.js';
 export const stateVector = (doc) => Y.decodeStateVector(Y.encodeStateVector(doc));
@@ -295,19 +295,17 @@ export const withoutPending = (doc, read) => {
 };
 /**
  * The live document as one update: its healed state — the engine
- * merged what each keystroke wrote and collected deleted content, sparing
- * the text a replica may copy again (`keepCopies`) —, without what
- * waits (`withoutPending`). Memory never runs ahead of storage, so it
- * holds exactly what the stored records hold, collected.
+ * merged what each keystroke wrote and collected deleted content —,
+ * without what waits (`withoutPending`). Memory never runs ahead of
+ * storage, so it holds exactly what the stored records hold, collected.
  */
 export const liveState = (doc) => withoutPending(doc, () => Y.encodeStateAsUpdate(doc));
 /**
  * A room document's collection rules, before any update applies: it keeps
- * what an editing replica keeps, and the content the last restore
- * deleted while its undo stands (`keep`, `room.history.undo`).
+ * the content the last restore deleted while its undo stands (`keep`,
+ * `room.history.undo`).
  */
 const prepareRoomDoc = (doc, keep) => {
-    crdt.doc.keepCopies(asEngineDoc(doc));
     keepFromCollection(doc, (it) => !(keep()?.intersects(it.id.client, it.id.clock, it.length) ?? false));
 };
 /** A fresh room document (`prepareRoomDoc`'s collection rules). */

package/dist/cloudflare/routeDocumentSocket.d.ts

@@ -50,6 +50,23 @@ export type RouteDocumentOptions = {
      * your page from another site's. Omitted: every origin passes.
      */
     allowedOrigins?: readonly string[] | ((origin: string) => boolean);
+    /**
+     * Answer a page on another origin (the app on `app.example.com`, the
+     * room on `rooms.example.com`): `OPTIONS` preflights are answered `204`
+     * (`GET, POST`, the headers the page asked for), and every HTTP answer
+     * (comments, history, the probes) carries `Access-Control-Allow-Origin`.
+     * The origins are `allowedOrigins`: with a list or a predicate, the
+     * request's `Origin` is echoed (`Vary: Origin`) and `credentials: true`
+     * lets the page send its cookies (`fetch(…, { credentials: 'include' })`);
+     * without one, every origin gets `*` and no credentials. A preflight from
+     * an origin `allowedOrigins` refuses is answered `403`. `maxAge`: how long
+     * a browser keeps a preflight, in seconds (default 600). A WebSocket dial
+     * needs none of it. Omitted: no CORS headers, and `OPTIONS` answers `405`.
+     */
+    cors?: boolean | {
+        credentials?: boolean;
+        maxAge?: number;
+    };
 };
 /** The replica a client asked for in `?replica=<doc.clientID>` (or `param`), or `null`. */
 export declare const requestedReplica: (request: Request, param?: string) => number | null;

package/dist/cloudflare/routeDocumentSocket.js

@@ -28,6 +28,50 @@ import { CLOSE, validRoomId } from '../crdt/providers/room.js';
 import { COMMENTS_HEADER, HISTORY_HEADER, HISTORY_KEY_HEADER, IDENTITY_HEADERS, PROBE_HEADER, closedSocket } from './room/shared.js';
 import { parseReplica } from './room/access.js';
 import { MAX_COMMENT_REQUEST_BYTES } from './room/comments.js';
+/** The CORS headers `options.cors` gives an answer to `request` (none: `null`). */
+const corsHeaders = (request, options) => {
+    const cors = options?.cors;
+    const origin = request.headers.get('Origin');
+    if (!cors || origin === null || !originAllowed(request, options))
+        return null;
+    const headers = new Headers();
+    if (options?.allowedOrigins === undefined) {
+        headers.set('Access-Control-Allow-Origin', '*');
+        return headers;
+    }
+    headers.set('Access-Control-Allow-Origin', origin);
+    headers.set('Vary', 'Origin');
+    if (typeof cors === 'object' && cors.credentials === true)
+        headers.set('Access-Control-Allow-Credentials', 'true');
+    return headers;
+};
+/**
+ * One HTTP route with `options.cors`: a preflight answered here, every other
+ * answer given its CORS headers (a `101` upgrade passes as it is).
+ */
+const withCors = async (request, options, route) => {
+    const cors = options?.cors;
+    if (cors && request.method === 'OPTIONS' && request.headers.has('Origin')) {
+        const headers = corsHeaders(request, options);
+        if (headers === null)
+            return new Response('origin not allowed', { status: 403 });
+        headers.set('Access-Control-Allow-Methods', 'GET, POST');
+        headers.set('Access-Control-Allow-Headers', request.headers.get('Access-Control-Request-Headers') ?? 'Content-Type');
+        headers.set('Access-Control-Max-Age', String((typeof cors === 'object' ? cors.maxAge : undefined) ?? 600));
+        return new Response(null, { status: 204, headers });
+    }
+    const response = await route();
+    const headers = corsHeaders(request, options);
+    if (headers === null || response.status === 101)
+        return response;
+    const merged = new Headers(response.headers);
+    headers.forEach((value, name) => merged.set(name, value));
+    return new Response(response.body, {
+        status: response.status,
+        statusText: response.statusText,
+        headers: merged
+    });
+};
 /** Is `request`'s `Origin` one `options` allows (no `Origin`, or no list: yes)? */
 const originAllowed = (request, options) => {
     const allowed = options?.allowedOrigins;
@@ -109,6 +153,9 @@ const identityHeaders = (identity) => {
  * `404` (the room keeps no history), `405` (another method).
  */
 export async function routeDocumentHistory(request, rooms, documentId, authorize, options) {
+    return withCors(request, options, () => routeHistory(request, rooms, documentId, authorize, options));
+}
+async function routeHistory(request, rooms, documentId, authorize, options) {
     const query = new URL(request.url).searchParams;
     const op = request.method === 'GET'
         ? query.has('key')
@@ -191,6 +238,9 @@ const bodyWithin = async (request, max) => {
  * comment bytes full), `429` (the user past the room's comment rate).
  */
 export async function routeDocumentComments(request, rooms, documentId, authorize, options) {
+    return withCors(request, options, () => routeComments(request, rooms, documentId, authorize, options));
+}
+async function routeComments(request, rooms, documentId, authorize, options) {
     const op = request.method === 'GET' ? 'list' : request.method === 'POST' ? 'post' : null;
     if (op === null)
         return new Response('method not allowed', { status: 405 });
@@ -215,6 +265,9 @@ export async function routeDocumentComments(request, rooms, documentId, authoriz
         .fetch(new Request(request.url, { method: op === 'post' ? 'POST' : 'GET', headers, body }));
 }
 export async function routeDocumentSocket(request, rooms, documentId, authorize, options) {
+    return withCors(request, options, () => routeSocket(request, rooms, documentId, authorize, options));
+}
+async function routeSocket(request, rooms, documentId, authorize, options) {
     // The probes: a plain GET, authorized like a dial, answered with JSON or
     // an HTTP status — `lastUpdated` and `snapshot` (the document).
     const query = new URL(request.url).searchParams;

package/dist/collaboration/comments/client.d.ts

@@ -48,7 +48,7 @@ export type CommentsClientOptions = {
     /**
      * The websocket sync's server URL (the `server` of `<Edytor>` or
      * `createWebsocketSync`), whose socket hears the room's changes. Default:
-     * `server` read as `ws:`/`wss:`.
+     * every websocket sync of the same room on the page, whatever its URL.
      */
     socket?: string;
     /** Query parameters sent with each request (a token): an object, or a function read at every request. */

package/dist/collaboration/comments/client.js

@@ -34,7 +34,7 @@ export const createCommentsClient = (options) => {
     assertRoomId(options.room);
     const server = options.server.replace(/\/+$/, '');
     const base = `${server.replace(/^ws/, 'http')}/${encodeURIComponent(options.room)}`;
-    const socket = (options.socket ?? server.replace(/^http/, 'ws')).replace(/\/+$/, '');
+    const socket = options.socket?.replace(/\/+$/, '') ?? null;
     const request = async (method, body) => {
         const url = new URL(base);
         const params = typeof options.params === 'function' ? options.params() : options.params;

package/dist/collaboration/remoteSelection.js

@@ -42,8 +42,8 @@ const getCaretRect = (point, origin, editor) => {
     const range = (point.node.ownerDocument ?? editor.ownerDocument).createRange();
     range.setStart(point.node, point.offset);
     range.collapse(true);
-    const rect = typeof range.getBoundingClientRect === 'function' ? range.getBoundingClientRect() : null;
-    if (rect && (rect.width || rect.height)) {
+    const rect = range.getBoundingClientRect();
+    if (rect.width || rect.height) {
         return toRemoteRect(rect, origin);
     }
     return getFallbackRect(point, origin, editor);
@@ -71,7 +71,7 @@ const getSelectionRects = (start, end, origin, editor) => {
         (end.text.node && renderSkipped(end.text.node))) {
         return [getFallbackRect(start, origin, editor)];
     }
-    const clientRects = typeof range.getClientRects === 'function' ? Array.from(range.getClientRects()) : [];
+    const clientRects = Array.from(range.getClientRects());
     const seen = new Set();
     const rects = clientRects
         .filter((rect) => rect.width || rect.height)

package/dist/components/Edytor.svelte

@@ -5,11 +5,9 @@
 	import { Edytor as EdytorClass, useEdytor } from '../edytor.svelte.js';
 	import {
 		SyncRefusedError,
-		type Awareness,
 		type DocChange,
 		type DocumentActor,
-		type EdytorDocument,
-		type YDoc
+		type EdytorDocument
 	} from '../crdt/index.js';
 	import { CLOSE, validRoomId } from '../crdt/providers/room.js';
 	import type { EdytorSync, WebsocketSyncOptions } from '../collaboration/index.js';
@@ -75,8 +73,6 @@
 		edytor?: EdytorClass;
 		/** The assembled document this view renders (see `crdt/document.ts`). */
 		document?: EdytorDocument;
-		doc?: YDoc;
-		awareness?: Awareness;
 		/** The local author (id, name, color) of the document this view owns: attribution and presence. */
 		actor?: DocumentActor;
 		/**
@@ -187,7 +183,6 @@
 		edytor = $bindable(),
 		// Aliased so the DOM `document` global keeps working in this scope.
 		document: edytorDocument,
-		doc,
 		readonly = false,
 		allowNesting = false,
 		value = defaultValue,
@@ -200,7 +195,6 @@
 		onSyncRefused,
 		requireHydration,
 		snapshot,
-		awareness,
 		actor,
 		presence,
 		onChange,
@@ -221,8 +215,6 @@
 		allowNesting,
 		plugins: defaultPlugins ? withDefaults(userPlugins) : userPlugins,
 		document: edytorDocument,
-		doc,
-		awareness,
 		actor,
 		requireHydration,
 		hotkeys,
@@ -294,7 +286,7 @@
 		}
 	});
 
-	// The component owns the Edytor — release its doc/awareness/facade/
+	// The component owns the Edytor — release its facade/
 	// undo-manager listeners so a shared doc doesn't retain dead mounts.
 	// `onDestroy` also runs after a server render: a view-owned document
 	// (and its awareness timer) must not outlive the request.

package/dist/components/Edytor.svelte.d.ts

@@ -1,5 +1,5 @@
 import { Edytor as EdytorClass, useEdytor } from '../edytor.svelte.js';
-import { SyncRefusedError, type Awareness, type DocChange, type DocumentActor, type EdytorDocument, type YDoc } from '../crdt/index.js';
+import { SyncRefusedError, type DocChange, type DocumentActor, type EdytorDocument } from '../crdt/index.js';
 import type { EdytorSync, WebsocketSyncOptions } from '../collaboration/index.js';
 import { type PresenceOptions } from '../collaboration/awarenessSelection.js';
 export { EdytorClass as EdytorContext, useEdytor };
@@ -21,8 +21,6 @@ export type EdytorProps = {
     edytor?: EdytorClass;
     /** The assembled document this view renders (see `crdt/document.ts`). */
     document?: EdytorDocument;
-    doc?: YDoc;
-    awareness?: Awareness;
     /** The local author (id, name, color) of the document this view owns: attribution and presence. */
     actor?: DocumentActor;
     /**