edytor 0.1.0-next.40 → 0.1.0-next.41

package/README.md

@@ -16,7 +16,7 @@
 
 Edytor aims to be for Svelte what Slate.js is for React: a heavily customizable editor with an API to build any kind of collaborative rich text editor.
 
-> **Work in progress.** Edytor is a pre-release (`0.1.0-next.40`, `edytor@next` on npm) and not ready for production; the API changes between releases without a compatibility layer. The untagged `edytor@0.0.11` on npm predates the current API. Issues and PRs are welcome: when you report a bug, include the document's JSON value.
+> **Work in progress.** Edytor is a pre-release (`0.1.0-next.41`, `edytor@next` on npm) and not ready for production; the API changes between releases without a compatibility layer. The untagged `edytor@0.0.11` on npm predates the current API. Issues and PRs are welcome: when you report a bug, include the document's JSON value.
 
 ## Features
 

package/dist/block/block.svelte.d.ts

@@ -1,6 +1,6 @@
 import { Text } from '../text/text.svelte.js';
 import type { Edytor } from '../edytor.svelte.js';
-import type { JSONBlock, JSONText, JSONInlineBlock } from '../utils/json.js';
+import type { JSONBlock, JSONInlineBlock } from '../utils/json.js';
 import { type BlockOperations } from './block.utils.js';
 import type { BlockDefinition } from '../plugins.js';
 import { InlineBlock } from './inlineBlock.svelte.js';
@@ -186,16 +186,4 @@ export declare class Block {
         text: Text;
         offset: number;
     } | null;
-    /**
-     * Insert children at `index`: a JSON spec is created (its id kept, minted
-     * when missing); a block handle moves there with its identity.
-     */
-    insertChildren: (index: number, blocks: (JSONBlock | Block)[]) => void;
-    /** Delete `length` visible children from `index`, each with its subtree (a document delete). */
-    deleteChildren: (index: number, length?: number) => void;
-    /**
-     * Insert content before part `index` (a text segment or an inline atom):
-     * each entry is a text's runs or an atom, as JSON.
-     */
-    insertParts: (index: number, parts: (JSONText[] | JSONInlineBlock)[]) => void;
 }

package/dist/block/block.svelte.js

@@ -355,9 +355,14 @@ export class Block {
     // ── JSON insertion (specs are data; `new Block({block})` is gone) ──
     /**
      * Insert children at `index`: a JSON spec is created (its id kept, minted
-     * when missing); a block handle moves there with its identity.
+     * when missing); a block handle moves there with its identity. A raw
+     * write for the editor's own commands: nothing on a view whose dispatcher
+     * refuses writes (readonly, a read-only document).
+     * @internal
      */
     insertChildren = (index, blocks) => {
+        if (!this.edytor.dispatcher.permits())
+            return;
         const { facade } = this.edytor;
         const parent = this.isRoot ? null : this.id;
         blocks.forEach((block, k) => {
@@ -367,17 +372,26 @@ export class Block {
                 facade.insertBlock({ parent, index: index + k }, jsonBlockToSpec(block));
         });
     };
-    /** Delete `length` visible children from `index`, each with its subtree (a document delete). */
+    /**
+     * Delete `length` visible children from `index`, each with its subtree (a
+     * document delete). Raw, as `insertChildren`.
+     * @internal
+     */
     deleteChildren = (index, length = 1) => {
+        if (!this.edytor.dispatcher.permits())
+            return;
         const ids = this.edytor.facade.childrenIds(this.isRoot ? null : this.id);
         for (const id of ids.slice(index, index + length).reverse())
             this.edytor.facade.block(id).delete({ keepChildren: false });
     };
     /**
      * Insert content before part `index` (a text segment or an inline atom):
-     * each entry is a text's runs or an atom, as JSON.
+     * each entry is a text's runs or an atom, as JSON. Raw, as `insertChildren`.
+     * @internal
      */
     insertParts = (index, parts) => {
+        if (!this.edytor.dispatcher.permits())
+            return;
         const model = this.model;
         if (!model)
             return;

package/dist/crdt/vendor/yjs/UPSTREAM.md

@@ -28,7 +28,7 @@ recorded patch and document it here.
 
 The v13 provider stack (`y-protocols`, `y-websocket`, `y-indexeddb`, `lib0@0.2`)
 is no longer a dependency of any kind: `tests/packed-consumer/smoke.js` and
-`src/tests/crdt/gate2/public-boundary.test.ts` refuse it.
+`src/tests/crdt/boundary-attacks/public-boundary.test.ts` refuse it.
 
 ## Layout
 
@@ -56,7 +56,7 @@ the run's artifact, says in the summary whether the installed `lib0-v14`
 satisfies the newer engine's `lib0` range (a mismatch is a run warning: a
 red check may then be the older lib0, not the fork), then materializes the newer engine as `bench/vendor-baseline/yjs`
 so `bench/lib/interop.mjs` (the fork and the newer engine syncing over the
-wire) and the baseline leg of `src/tests/crdt/hardening/r1-p4-format.test.ts`
+wire) and the baseline leg of `src/tests/crdt/hardening/search-marker-format.test.ts`
 (byte-identical stores after every operation) run against it. A red run
 means the re-sync needs care; the re-sync itself is the manual recipe under
 YP8. Locally: `node scripts/upstream-check.mjs`, then those two checks, then
@@ -204,7 +204,7 @@ added path inert = upstream behavior) and requires **byte-identical**
 `encodeStateAsUpdate` output plus identical rendered deltas — covering
 distant inserts, formatted retains, format-marker inserts, deletes, undo/
 redo, remote apply, GC, nested modify ops, merge/split cycles.
-`src/tests/crdt/hardening/r1-p4-format.test.ts` pins the same-key boundary
+`src/tests/crdt/hardening/search-marker-format.test.ts` pins the same-key boundary
 rule (the R1 review's YP4 corruption), runs randomized + structured
 differential replays (patched vs disabled vs materialized pre-P4 baseline)
 with per-op `toDelta` + store-byte equality across insert/delete/format/
@@ -291,7 +291,7 @@ purity (no updates/splits/undo/renderer changes; marker perturbation
 invisible to mutations), traversal bounds, and the
 `a[b]b[b=null]c` read-seed-vs-mutation-seed counterexample.
 `src/tests/crdt/runs/range-reads.test.ts` +
-`gateF2/wu8-range-reads.test.ts` cover the Edytor projection: parity vs
+`text-model-probes/range-read-hazards.test.ts` cover the Edytor projection: parity vs
 the pre-WU8 `toDelta().toJSON()` oracle at every range, marker pinning
 (`index` = anchor's left edge, `formats` = fold at that edge), the
 marks-alias boundary (corruption is confined to one cursor — marker
@@ -486,10 +486,10 @@ Correctness oracle:
   every top-level vendored declaration outside the allowlist above.
 - `bench/lib/mk-baseline.sh` now materializes the PRISTINE upstream engine
   (`@y/y@14.0.0-rc.26`, installed as the `@y/protocols` peer, + YP1), and the
-  baseline leg of `src/tests/crdt/hardening/r1-p4-format.test.ts` (patched vs
+  baseline leg of `src/tests/crdt/hardening/search-marker-format.test.ts` (patched vs
   upstream, per-op `toDelta` + byte-identical `encodeStateAsUpdate`) and
   `bench/lib/interop.mjs` pass against it; the YP4/YP7 differentials
-  (`r1-p4-format`, `marker-seed`, `yp7-gap-end`) stay green.
+  (`search-marker-format`, `marker-seed`, `yp7-gap-end`) stay green.
 
 Re-syncing with upstream: take the new upstream `src/`, apply YP1, re-apply
 the YP4/YP5/YP7 hunks (diff this tree against the pinned upstream as in
@@ -507,7 +507,7 @@ triggers `readUpdateV2`'s retry, and the document holds a pending update it
 could integrate — forever, until some unrelated update from the recorded
 client arrives. Reproduced on the unmodified `@y/y@14.0.0-rc.26` with four
 updates (A1 ← B1 ← A3, A2 independent) delivered as A3, B1, A1, A2; found by
-the architecture-v2 phase-2 fuzz (`src/tests/crdt/arch-v2/p1-fuzz.test.ts`, an
+the architecture-v2 phase-2 fuzz (`src/tests/crdt/arch-v2/replica-fuzz.test.ts`, an
 observer fed every update in reverse order stayed pending in 74/1,500 seeds).
 
 Patch (all hunks marked `// YP9` or delimited by `// YP9 begin` / `// YP9 end`):
@@ -648,7 +648,7 @@ fork adds paired marks (Peritext / Loro anchor pairing), schema generation 5:
 Plain formats (every upstream test) are untouched: the class of a plain
 item is content's, so the comparator reduces to upstream's.
 
-Oracle: `src/tests/crdt/arch-v2/h5-marks.test.ts` (the Peritext cases on
+Oracle: `src/tests/crdt/arch-v2/paired-marks.test.ts` (the Peritext cases on
 every swept client-id pair and delivery order; 7 of its 17 rows fail on
 the tree without YP13), the upstream suite unchanged.
 
@@ -687,7 +687,7 @@ key (`deleteAttr`) delete their subtree as before. `YNode#applyDelta`
 still writes nothing to a deleted node, so the kept node's own attrs are
 frozen; its children (a text, a list, a map) are ordinary live types.
 
-Oracle: `src/tests/crdt/phase5/h13-same-id.test.ts` (the losing text shows
+Oracle: `src/tests/crdt/placement/same-id-concurrent.test.ts` (the losing text shows
 on every replica and after a reload; two fuzzes), the upstream suite
 unchanged.
 

package/dist/text/text.svelte.d.ts

@@ -39,12 +39,6 @@ export declare class Text {
      * the caret is a render the projector displays after (`mounted`).
      */
     refreshFromModel: () => void;
-    /** Insert `text` (optionally marked) at segment-local `offset`. */
-    insertAt: (offset: number, text: string, marks?: Record<string, unknown> | null) => boolean;
-    /** Delete `length` atoms at segment-local `offset`. */
-    deleteAt: (offset: number, length: number) => boolean;
-    /** Multi-mark format over `[offset, offset+length)` — `null` values remove the mark. */
-    formatAt: (offset: number, length: number, attributes: Record<string, unknown>) => boolean;
     private batch;
     getMarksAtRange: (yStart: number, yEnd: number) => JSONText[];
     insertText: (args_0: {

package/dist/text/text.svelte.js

@@ -87,12 +87,18 @@ export class Text {
     // are SEGMENT-LOCAL display atoms (UTF-16 units); `segStart` maps them into
     // the block's display space (read from the index, so a write after another
     // in the same transaction lands right).
-    /** Insert `text` (optionally marked) at segment-local `offset`. */
-    insertAt = (offset, text, marks) => accepted(this.parent.model?.insertText(this.segStart + offset, text, marks ?? undefined));
-    /** Delete `length` atoms at segment-local `offset`. */
-    deleteAt = (offset, length) => accepted(this.parent.model?.deleteText(this.segStart + offset, length));
-    /** Multi-mark format over `[offset, offset+length)` — `null` values remove the mark. */
-    formatAt = (offset, length, attributes) => accepted(this.parent.model?.format(this.segStart + offset, length, attributes));
+    // They write raw (no hooks, no undo policy of their own): the commands
+    // that call them passed the dispatcher's admission, and a call a readonly
+    // view or a read-only document would refuse writes nothing.
+    /** Insert `text` (optionally marked) at segment-local `offset`. @internal */
+    insertAt = (offset, text, marks) => this.edytor.dispatcher.permits() &&
+        accepted(this.parent.model?.insertText(this.segStart + offset, text, marks ?? undefined));
+    /** Delete `length` atoms at segment-local `offset`. @internal */
+    deleteAt = (offset, length) => this.edytor.dispatcher.permits() &&
+        accepted(this.parent.model?.deleteText(this.segStart + offset, length));
+    /** Multi-mark format over `[offset, offset+length)` — `null` values remove the mark. @internal */
+    formatAt = (offset, length, attributes) => this.edytor.dispatcher.permits() &&
+        accepted(this.parent.model?.format(this.segStart + offset, length, attributes));
     batch = batch.bind(this);
     getMarksAtRange = getMarksAtRange.bind(this);
     insertText = this.batch('insertText', insertText.bind(this));

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "edytor",
 	"license": "MIT",
-	"version": "0.1.0-next.40",
+	"version": "0.1.0-next.41",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/beynar/edytor.git"