@quillmark/wasm 0.110.0 → 0.112.0

package/backends/pdfform/wasm.js

@@ -279,6 +279,10 @@ export class Document {
      * Throws on an out-of-range card, a field that is not richtext, a malformed
      * bundle, or an op that applies out of bounds; the value is unchanged on a
      * failed apply.
+     *
+     * Each text-moving channel rebases the marks already in the field, by the
+     * rule on `ChangeBundle`; `mapMarks` answers where they land, so a caller
+     * building `markOps` need not predict it.
      * @param {Addr | string} addr
      * @param {ChangeBundle} bundle
      */
@@ -1406,15 +1410,22 @@ export class LiveSession {
      * `FieldRegion.rect`, so from a canvas click use
      * `x = clickPx.x / renderScale`, `y = pageHeightPt - clickPx.y / renderScale`.
      * Unlike `regions()`, *every* placement answers, not just the first.
+     *
+     * `tolPt` is how far off the ink a click still counts, in the same points,
+     * and defaults to `0` — exact. Convert the pointer slack a surface wants
+     * from CSS pixels at the scale it drew the page (`slackPx / renderScale`),
+     * so it stays the same size under the cursor as the page zooms. The
+     * nearest placement answers, so raising it only fills a miss.
      * @param {number} page
      * @param {number} x
      * @param {number} y
+     * @param {number | null} [tol_pt]
      * @returns {string | undefined}
      */
-    fieldAt(page, x, y) {
+    fieldAt(page, x, y, tol_pt) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.livesession_fieldAt(retptr, this.__wbg_ptr, page, x, y);
+            wasm.livesession_fieldAt(retptr, this.__wbg_ptr, page, x, y, isLikeNone(tol_pt) ? 0x100000001 : Math.fround(tol_pt));
             var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
             var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
             let v1;
@@ -1533,16 +1544,21 @@ export class LiveSession {
     /**
      * A point → **content position**: the field *and* a USV offset into its
      * `Content`, for placing a caret or mapping a selection into the content
-     * model, or `undefined` off all content ink. `x`/`y` are PDF points,
-     * bottom-left origin, as in `fieldAt`. The offset is cluster-exact and
-     * degrades to the containing segment's start on origin-less ink.
+     * model, or `undefined` off all content ink. `x`/`y`/`tolPt` are PDF
+     * points, bottom-left origin, as in `fieldAt`. The offset is cluster-exact
+     * and degrades to the containing segment's start on origin-less ink.
+     *
+     * `tolPt` earns the most here: the leading between two lines lies inside a
+     * paragraph and on no glyph, and under `tolPt` such a point takes the
+     * nearer line.
      * @param {number} page
      * @param {number} x
      * @param {number} y
+     * @param {number | null} [tol_pt]
      * @returns {ContentHit | undefined}
      */
-    positionAt(page, x, y) {
-        const ret = wasm.livesession_positionAt(this.__wbg_ptr, page, x, y);
+    positionAt(page, x, y, tol_pt) {
+        const ret = wasm.livesession_positionAt(this.__wbg_ptr, page, x, y, isLikeNone(tol_pt) ? 0x100000001 : Math.fround(tol_pt));
         return takeObject(ret);
     }
     /**
@@ -2154,11 +2170,48 @@ export function importMarkdown(markdown) {
     }
 }
 
+/**
+ * Where `bundle`'s text-moving channels (`delta`, then `islandOps`, then
+ * `lineOps`) leave `content`'s marks: the final-text coordinates the bundle's
+ * `markOps` are written in, under the rebase rule stated on `ChangeBundle`.
+ * The document-free read an editor diffs against to decide which `markOps` to
+ * emit, rather than reproducing that rule in its own language.
+ *
+ * `bundle.markOps` are ignored. The answer is normalized, as the store's is:
+ * marks a text move drops (out of range, zero-width formatting) are absent,
+ * and same-kind runs a move left adjacent arrive already unioned, so a bundle
+ * carrying no `markOps` names the marks the field will hold.
+ * Throws on a non-content `content`, a malformed bundle, or an op that applies
+ * out of bounds: `applyChange`'s errors on the same ops.
+ * @param {Content} content
+ * @param {ChangeBundle} bundle
+ * @returns {ContentMark[]}
+ */
+export function mapMarks(content, bundle) {
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        wasm.mapMarks(retptr, addHeapObject(content), addHeapObject(bundle));
+        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+        var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
+        if (r2) {
+            throw takeObject(r1);
+        }
+        return takeObject(r0);
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+    }
+}
+
 /**
  * Map a base content position (a USV index into `Content.text`, not a UTF-16
  * offset) through a `delta` to its new position, holding a caret stable across
  * a `revise`. `assoc` decides the side of a same-position insertion (`"after"`
  * moves past it). Throws on a malformed `delta`.
+ *
+ * This maps a position the *caller* holds. For the marks already in a field,
+ * `mapMarks` applies the store's own assoc rule across every channel of a
+ * `ChangeBundle`.
  * @param {Delta} delta
  * @param {number} pos
  * @param {Assoc} assoc

package/backends/pdfform/wasm_bg.wasm.d.ts

@@ -64,18 +64,19 @@ export const exportMarkdown: (a: number, b: number) => void;
 export const formatDocPath: (a: number, b: number) => void;
 export const importMarkdown: (a: number, b: number, c: number) => void;
 export const livesession_backendId: (a: number, b: number) => void;
-export const livesession_fieldAt: (a: number, b: number, c: number, d: number, e: number) => void;
+export const livesession_fieldAt: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
 export const livesession_fieldBoxes: (a: number, b: number, c: number, d: number) => void;
 export const livesession_locate: (a: number, b: number, c: number, d: number) => number;
 export const livesession_pageCount: (a: number) => number;
 export const livesession_pageSize: (a: number, b: number, c: number) => void;
 export const livesession_paint: (a: number, b: number, c: number, d: number, e: number) => void;
-export const livesession_positionAt: (a: number, b: number, c: number, d: number) => number;
+export const livesession_positionAt: (a: number, b: number, c: number, d: number, e: number) => number;
 export const livesession_regions: (a: number, b: number) => void;
 export const livesession_render: (a: number, b: number, c: number) => void;
 export const livesession_supportsCanvas: (a: number) => number;
 export const livesession_update: (a: number, b: number, c: number) => void;
 export const livesession_warnings: (a: number, b: number) => void;
+export const mapMarks: (a: number, b: number, c: number) => void;
 export const mapPos: (a: number, b: number, c: number, d: number) => void;
 export const parseDocPath: (a: number, b: number, c: number) => void;
 export const quill_backendId: (a: number, b: number) => void;

package/backends/typst/wasm.d.ts

@@ -74,8 +74,9 @@ export interface Content {
 
 /** One `\n`-separated segment of `Content.text`, in order. `kind` is an open set:
  * an unknown role round-trips with opaque `attrs` and renders as a paragraph.
- * The open arm blocks discriminant narrowing, so read `level`/`lang` behind a
- * check of the arm you want. */
+ * Every role spells its payload in `attrs`, known or not, so promoting one moves
+ * no bytes. The open arm blocks discriminant narrowing, so read
+ * `attrs.level`/`attrs.lang` behind a check of the arm you want. */
 export type ContentLine = {
     containers: ContentContainer[];
     /** A within-block hard line break rather than a new block. Omitted (false) in the common case. */
@@ -85,11 +86,11 @@ export type ContentLine = {
 /** A line's block role, shared by `ContentLine` and the `setKind` op. */
 export type ContentLineKind =
 | { kind: "para" }
-| { kind: "heading"; level: number }
-| { kind: "code"; lang?: string }
+| { kind: "heading"; attrs: { level: number } }
+| { kind: "code"; attrs?: { lang?: string } }
 | { kind: "island" }
 | { kind: "rule" }
-| { kind: string; attrs: unknown };
+| { kind: string; attrs?: unknown };
 
 /** An ancestor block a line nests inside, outermost first. Open like
  * `ContentLine.kind`: an unrecognized container round-trips with opaque `attrs`
@@ -118,22 +119,26 @@ export type ContentLineKind =
  * Content parsed from a stored document is the one shape that arrives without
  * it — storage omits a zero — and needs a cast. */
 export type ContentContainer =
-| { container: "list_item"; ordered: boolean; start: number; ordinal: number; instance: number }
+| {
+    container: "list_item";
+    attrs: { ordered: boolean; start: number; ordinal: number };
+    instance: number;
+}
 | { container: "quote"; instance: number }
-| { container: string; attrs: unknown; instance: number };
+| { container: string; attrs?: unknown; instance: number };
 
 /** A mark over char range `[start, end)` into `Content.text`. The open `type`
  * arm blocks discriminant narrowing, so read a payload-carrying arm behind its
- * guard: `isLinkMark` (`url`) / `isAnchorMark` (`id`), from
+ * guard: `isLinkMark` (`attrs.url`) / `isAnchorMark` (`attrs.id`), from
  * `@quillmark/wasm/runtime`. An `anchor`'s `id` is a caller-supplied opaque
  * handle, unique per `Content` and invariant while the mark lives (positions
  * rebase, the id never does); it has no markdown projection and survives only
  * through the edit lane. */
 export type ContentMark = { start: number; end: number } & (
 | { type: "strong" | "emph" | "underline" | "strike" | "code" }
-| { type: "link"; url: string }
-| { type: "anchor"; id: string }
-| { type: string; attrs: unknown }
+| { type: "link"; attrs: { url: string } }
+| { type: "anchor"; attrs: { id: string } }
+| { type: string; attrs?: unknown }
 );
 
 /** A cell in a `TableProps`. `marks` rides the prose `ContentMark` shape, but
@@ -290,6 +295,18 @@ export type IslandOp =
  * Within each channel ops apply in sequence against the state the earlier ones
  * left: an island `insert`'s `at` counts earlier ops' slots, and `lineOps`
  * positions and indices renumber through earlier `split`/`join`.
+ *
+ * **Mark rebase.** `delta`, `islandOps` and `lineOps` each move text, and each
+ * rebases the marks already in the field by one rule: a range mark's `start`
+ * takes assoc `after` and its `end` `before`, so an insertion at either edge
+ * grows text *outside* the span; a **zero-width** mark takes `before`, so an
+ * insertion at its own position leaves it put. That last case is the one
+ * position where the two assocs differ, and where an anchor most often sits.
+ *
+ * `markOps` name the result, so a caller emitting them predicts this rebase.
+ * `mapMarks(content, bundle)` runs it instead: pass the bundle's text-moving
+ * channels, diff the marks it returns against the ones you intend, and emit
+ * only the difference. Reproducing the rule by hand is a second copy to drift.
  */
 export interface ChangeBundle {
     delta?: Delta;
@@ -548,7 +565,7 @@ export interface ContentHit {
      */
     field: string;
     /**
-     * USV offset into the field\'s `Content`.
+     * USV offset into the field's `Content`.
      */
     pos: number;
     /**
@@ -565,12 +582,12 @@ export interface ContentHit {
  * (paragraph, heading, whole code fence) and per page each touches, a scalar
  * referenced at several plate sites surfaces each site, and tracked content
  * plus a `field:`-bound widget yields both. Group by `field`. The whole-field
- * highlight is the union of a page\'s `span`-bearing rects, so inter-paragraph
+ * highlight is the union of a page's `span`-bearing rects, so inter-paragraph
  * whitespace stays uncovered; `LiveSession.fieldBoxes(field)` owns that union.
  */
 export interface FieldRegion {
     /**
-     * Canonical `DocPath` field address (e.g. `\"cards.indorsement[1].from\"`):
+     * Canonical `DocPath` field address (e.g. `"cards.indorsement[1].from"`):
      * the grammar `parseDocPath` reads and `Diagnostic.path` carries. Feed it
      * back to `fieldBoxes` / `locate`.
      */
@@ -584,7 +601,7 @@ export interface FieldRegion {
      */
     rect: [number, number, number, number];
     /**
-     * The slice this box covers: USV `[start, end)` into the field\'s `Content`
+     * The slice this box covers: USV `[start, end)` into the field's `Content`
      * for one content segment, `undefined` for a scalar site or widget.
      */
     span?: [number, number];
@@ -599,7 +616,7 @@ export interface Diagnostic {
     message: string;
     location?: Location;
     /**
-     * Document-model path anchor (e.g. `\"cards.indorsement[0].signature_block\"`),
+     * Document-model path anchor (e.g. `"cards.indorsement[0].signature_block"`),
      * set on schema validation diagnostics and `undefined` otherwise.
      */
     path?: string;
@@ -720,6 +737,10 @@ export class Document {
      * Throws on an out-of-range card, a field that is not richtext, a malformed
      * bundle, or an op that applies out of bounds; the value is unchanged on a
      * failed apply.
+     *
+     * Each text-moving channel rebases the marks already in the field, by the
+     * rule on `ChangeBundle`; `mapMarks` answers where they land, so a caller
+     * building `markOps` need not predict it.
      */
     applyChange(addr: Addr | string, bundle: ChangeBundle): void;
     /**
@@ -1056,8 +1077,14 @@ export class LiveSession {
      * `FieldRegion.rect`, so from a canvas click use
      * `x = clickPx.x / renderScale`, `y = pageHeightPt - clickPx.y / renderScale`.
      * Unlike `regions()`, *every* placement answers, not just the first.
+     *
+     * `tolPt` is how far off the ink a click still counts, in the same points,
+     * and defaults to `0` — exact. Convert the pointer slack a surface wants
+     * from CSS pixels at the scale it drew the page (`slackPx / renderScale`),
+     * so it stays the same size under the cursor as the page zooms. The
+     * nearest placement answers, so raising it only fills a miss.
      */
-    fieldAt(page: number, x: number, y: number): string | undefined;
+    fieldAt(page: number, x: number, y: number, tol_pt?: number | null): string | undefined;
     /**
      * The whole-field highlight boxes for `field`: one union rect per page over
      * the field's `span`-bearing content segments, the union `regions()` leaves
@@ -1097,11 +1124,15 @@ export class LiveSession {
     /**
      * A point → **content position**: the field *and* a USV offset into its
      * `Content`, for placing a caret or mapping a selection into the content
-     * model, or `undefined` off all content ink. `x`/`y` are PDF points,
-     * bottom-left origin, as in `fieldAt`. The offset is cluster-exact and
-     * degrades to the containing segment's start on origin-less ink.
+     * model, or `undefined` off all content ink. `x`/`y`/`tolPt` are PDF
+     * points, bottom-left origin, as in `fieldAt`. The offset is cluster-exact
+     * and degrades to the containing segment's start on origin-less ink.
+     *
+     * `tolPt` earns the most here: the leading between two lines lies inside a
+     * paragraph and on no glyph, and under `tolPt` such a point takes the
+     * nearer line.
      */
-    positionAt(page: number, x: number, y: number): ContentHit | undefined;
+    positionAt(page: number, x: number, y: number, tol_pt?: number | null): ContentHit | undefined;
     /**
      * Schema-field geometry for this compiled session: each content field's
      * **first placement** (one region per page it touches) plus widget and
@@ -1296,11 +1327,31 @@ export function formatDocPath(segs: DocPathSeg[]): string;
  */
 export function importMarkdown(markdown: string): Content;
 
+/**
+ * Where `bundle`'s text-moving channels (`delta`, then `islandOps`, then
+ * `lineOps`) leave `content`'s marks: the final-text coordinates the bundle's
+ * `markOps` are written in, under the rebase rule stated on `ChangeBundle`.
+ * The document-free read an editor diffs against to decide which `markOps` to
+ * emit, rather than reproducing that rule in its own language.
+ *
+ * `bundle.markOps` are ignored. The answer is normalized, as the store's is:
+ * marks a text move drops (out of range, zero-width formatting) are absent,
+ * and same-kind runs a move left adjacent arrive already unioned, so a bundle
+ * carrying no `markOps` names the marks the field will hold.
+ * Throws on a non-content `content`, a malformed bundle, or an op that applies
+ * out of bounds: `applyChange`'s errors on the same ops.
+ */
+export function mapMarks(content: Content, bundle: ChangeBundle): ContentMark[];
+
 /**
  * Map a base content position (a USV index into `Content.text`, not a UTF-16
  * offset) through a `delta` to its new position, holding a caret stable across
  * a `revise`. `assoc` decides the side of a same-position insertion (`"after"`
  * moves past it). Throws on a malformed `delta`.
+ *
+ * This maps a position the *caller* holds. For the marks already in a field,
+ * `mapMarks` applies the store's own assoc rule across every channel of a
+ * `ChangeBundle`.
  */
 export function mapPos(delta: Delta, pos: number, assoc: Assoc): number;
 
@@ -1394,18 +1445,19 @@ export interface InitOutput {
     readonly formatDocPath: (a: number, b: number) => void;
     readonly importMarkdown: (a: number, b: number, c: number) => void;
     readonly livesession_backendId: (a: number, b: number) => void;
-    readonly livesession_fieldAt: (a: number, b: number, c: number, d: number, e: number) => void;
+    readonly livesession_fieldAt: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
     readonly livesession_fieldBoxes: (a: number, b: number, c: number, d: number) => void;
     readonly livesession_locate: (a: number, b: number, c: number, d: number) => number;
     readonly livesession_pageCount: (a: number) => number;
     readonly livesession_pageSize: (a: number, b: number, c: number) => void;
     readonly livesession_paint: (a: number, b: number, c: number, d: number, e: number) => void;
-    readonly livesession_positionAt: (a: number, b: number, c: number, d: number) => number;
+    readonly livesession_positionAt: (a: number, b: number, c: number, d: number, e: number) => number;
     readonly livesession_regions: (a: number, b: number) => void;
     readonly livesession_render: (a: number, b: number, c: number) => void;
     readonly livesession_supportsCanvas: (a: number) => number;
     readonly livesession_update: (a: number, b: number, c: number) => void;
     readonly livesession_warnings: (a: number, b: number) => void;
+    readonly mapMarks: (a: number, b: number, c: number) => void;
     readonly mapPos: (a: number, b: number, c: number, d: number) => void;
     readonly parseDocPath: (a: number, b: number, c: number) => void;
     readonly quill_backendId: (a: number, b: number) => void;

package/backends/typst/wasm.js

@@ -279,6 +279,10 @@ export class Document {
      * Throws on an out-of-range card, a field that is not richtext, a malformed
      * bundle, or an op that applies out of bounds; the value is unchanged on a
      * failed apply.
+     *
+     * Each text-moving channel rebases the marks already in the field, by the
+     * rule on `ChangeBundle`; `mapMarks` answers where they land, so a caller
+     * building `markOps` need not predict it.
      * @param {Addr | string} addr
      * @param {ChangeBundle} bundle
      */
@@ -1406,15 +1410,22 @@ export class LiveSession {
      * `FieldRegion.rect`, so from a canvas click use
      * `x = clickPx.x / renderScale`, `y = pageHeightPt - clickPx.y / renderScale`.
      * Unlike `regions()`, *every* placement answers, not just the first.
+     *
+     * `tolPt` is how far off the ink a click still counts, in the same points,
+     * and defaults to `0` — exact. Convert the pointer slack a surface wants
+     * from CSS pixels at the scale it drew the page (`slackPx / renderScale`),
+     * so it stays the same size under the cursor as the page zooms. The
+     * nearest placement answers, so raising it only fills a miss.
      * @param {number} page
      * @param {number} x
      * @param {number} y
+     * @param {number | null} [tol_pt]
      * @returns {string | undefined}
      */
-    fieldAt(page, x, y) {
+    fieldAt(page, x, y, tol_pt) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.livesession_fieldAt(retptr, this.__wbg_ptr, page, x, y);
+            wasm.livesession_fieldAt(retptr, this.__wbg_ptr, page, x, y, isLikeNone(tol_pt) ? 0x100000001 : Math.fround(tol_pt));
             var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
             var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
             let v1;
@@ -1533,16 +1544,21 @@ export class LiveSession {
     /**
      * A point → **content position**: the field *and* a USV offset into its
      * `Content`, for placing a caret or mapping a selection into the content
-     * model, or `undefined` off all content ink. `x`/`y` are PDF points,
-     * bottom-left origin, as in `fieldAt`. The offset is cluster-exact and
-     * degrades to the containing segment's start on origin-less ink.
+     * model, or `undefined` off all content ink. `x`/`y`/`tolPt` are PDF
+     * points, bottom-left origin, as in `fieldAt`. The offset is cluster-exact
+     * and degrades to the containing segment's start on origin-less ink.
+     *
+     * `tolPt` earns the most here: the leading between two lines lies inside a
+     * paragraph and on no glyph, and under `tolPt` such a point takes the
+     * nearer line.
      * @param {number} page
      * @param {number} x
      * @param {number} y
+     * @param {number | null} [tol_pt]
      * @returns {ContentHit | undefined}
      */
-    positionAt(page, x, y) {
-        const ret = wasm.livesession_positionAt(this.__wbg_ptr, page, x, y);
+    positionAt(page, x, y, tol_pt) {
+        const ret = wasm.livesession_positionAt(this.__wbg_ptr, page, x, y, isLikeNone(tol_pt) ? 0x100000001 : Math.fround(tol_pt));
         return takeObject(ret);
     }
     /**
@@ -2154,11 +2170,48 @@ export function importMarkdown(markdown) {
     }
 }
 
+/**
+ * Where `bundle`'s text-moving channels (`delta`, then `islandOps`, then
+ * `lineOps`) leave `content`'s marks: the final-text coordinates the bundle's
+ * `markOps` are written in, under the rebase rule stated on `ChangeBundle`.
+ * The document-free read an editor diffs against to decide which `markOps` to
+ * emit, rather than reproducing that rule in its own language.
+ *
+ * `bundle.markOps` are ignored. The answer is normalized, as the store's is:
+ * marks a text move drops (out of range, zero-width formatting) are absent,
+ * and same-kind runs a move left adjacent arrive already unioned, so a bundle
+ * carrying no `markOps` names the marks the field will hold.
+ * Throws on a non-content `content`, a malformed bundle, or an op that applies
+ * out of bounds: `applyChange`'s errors on the same ops.
+ * @param {Content} content
+ * @param {ChangeBundle} bundle
+ * @returns {ContentMark[]}
+ */
+export function mapMarks(content, bundle) {
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        wasm.mapMarks(retptr, addHeapObject(content), addHeapObject(bundle));
+        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+        var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
+        if (r2) {
+            throw takeObject(r1);
+        }
+        return takeObject(r0);
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+    }
+}
+
 /**
  * Map a base content position (a USV index into `Content.text`, not a UTF-16
  * offset) through a `delta` to its new position, holding a caret stable across
  * a `revise`. `assoc` decides the side of a same-position insertion (`"after"`
  * moves past it). Throws on a malformed `delta`.
+ *
+ * This maps a position the *caller* holds. For the marks already in a field,
+ * `mapMarks` applies the store's own assoc rule across every channel of a
+ * `ChangeBundle`.
  * @param {Delta} delta
  * @param {number} pos
  * @param {Assoc} assoc

package/backends/typst/wasm_bg.wasm.d.ts

@@ -64,18 +64,19 @@ export const exportMarkdown: (a: number, b: number) => void;
 export const formatDocPath: (a: number, b: number) => void;
 export const importMarkdown: (a: number, b: number, c: number) => void;
 export const livesession_backendId: (a: number, b: number) => void;
-export const livesession_fieldAt: (a: number, b: number, c: number, d: number, e: number) => void;
+export const livesession_fieldAt: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
 export const livesession_fieldBoxes: (a: number, b: number, c: number, d: number) => void;
 export const livesession_locate: (a: number, b: number, c: number, d: number) => number;
 export const livesession_pageCount: (a: number) => number;
 export const livesession_pageSize: (a: number, b: number, c: number) => void;
 export const livesession_paint: (a: number, b: number, c: number, d: number, e: number) => void;
-export const livesession_positionAt: (a: number, b: number, c: number, d: number) => number;
+export const livesession_positionAt: (a: number, b: number, c: number, d: number, e: number) => number;
 export const livesession_regions: (a: number, b: number) => void;
 export const livesession_render: (a: number, b: number, c: number) => void;
 export const livesession_supportsCanvas: (a: number) => number;
 export const livesession_update: (a: number, b: number, c: number) => void;
 export const livesession_warnings: (a: number, b: number) => void;
+export const mapMarks: (a: number, b: number, c: number) => void;
 export const mapPos: (a: number, b: number, c: number, d: number) => void;
 export const parseDocPath: (a: number, b: number, c: number) => void;
 export const quill_backendId: (a: number, b: number) => void;

package/core/wasm.d.ts

@@ -74,8 +74,9 @@ export interface Content {
 
 /** One `\n`-separated segment of `Content.text`, in order. `kind` is an open set:
  * an unknown role round-trips with opaque `attrs` and renders as a paragraph.
- * The open arm blocks discriminant narrowing, so read `level`/`lang` behind a
- * check of the arm you want. */
+ * Every role spells its payload in `attrs`, known or not, so promoting one moves
+ * no bytes. The open arm blocks discriminant narrowing, so read
+ * `attrs.level`/`attrs.lang` behind a check of the arm you want. */
 export type ContentLine = {
     containers: ContentContainer[];
     /** A within-block hard line break rather than a new block. Omitted (false) in the common case. */
@@ -85,11 +86,11 @@ export type ContentLine = {
 /** A line's block role, shared by `ContentLine` and the `setKind` op. */
 export type ContentLineKind =
 | { kind: "para" }
-| { kind: "heading"; level: number }
-| { kind: "code"; lang?: string }
+| { kind: "heading"; attrs: { level: number } }
+| { kind: "code"; attrs?: { lang?: string } }
 | { kind: "island" }
 | { kind: "rule" }
-| { kind: string; attrs: unknown };
+| { kind: string; attrs?: unknown };
 
 /** An ancestor block a line nests inside, outermost first. Open like
  * `ContentLine.kind`: an unrecognized container round-trips with opaque `attrs`
@@ -118,22 +119,26 @@ export type ContentLineKind =
  * Content parsed from a stored document is the one shape that arrives without
  * it — storage omits a zero — and needs a cast. */
 export type ContentContainer =
-| { container: "list_item"; ordered: boolean; start: number; ordinal: number; instance: number }
+| {
+    container: "list_item";
+    attrs: { ordered: boolean; start: number; ordinal: number };
+    instance: number;
+}
 | { container: "quote"; instance: number }
-| { container: string; attrs: unknown; instance: number };
+| { container: string; attrs?: unknown; instance: number };
 
 /** A mark over char range `[start, end)` into `Content.text`. The open `type`
  * arm blocks discriminant narrowing, so read a payload-carrying arm behind its
- * guard: `isLinkMark` (`url`) / `isAnchorMark` (`id`), from
+ * guard: `isLinkMark` (`attrs.url`) / `isAnchorMark` (`attrs.id`), from
  * `@quillmark/wasm/runtime`. An `anchor`'s `id` is a caller-supplied opaque
  * handle, unique per `Content` and invariant while the mark lives (positions
  * rebase, the id never does); it has no markdown projection and survives only
  * through the edit lane. */
 export type ContentMark = { start: number; end: number } & (
 | { type: "strong" | "emph" | "underline" | "strike" | "code" }
-| { type: "link"; url: string }
-| { type: "anchor"; id: string }
-| { type: string; attrs: unknown }
+| { type: "link"; attrs: { url: string } }
+| { type: "anchor"; attrs: { id: string } }
+| { type: string; attrs?: unknown }
 );
 
 /** A cell in a `TableProps`. `marks` rides the prose `ContentMark` shape, but
@@ -290,6 +295,18 @@ export type IslandOp =
  * Within each channel ops apply in sequence against the state the earlier ones
  * left: an island `insert`'s `at` counts earlier ops' slots, and `lineOps`
  * positions and indices renumber through earlier `split`/`join`.
+ *
+ * **Mark rebase.** `delta`, `islandOps` and `lineOps` each move text, and each
+ * rebases the marks already in the field by one rule: a range mark's `start`
+ * takes assoc `after` and its `end` `before`, so an insertion at either edge
+ * grows text *outside* the span; a **zero-width** mark takes `before`, so an
+ * insertion at its own position leaves it put. That last case is the one
+ * position where the two assocs differ, and where an anchor most often sits.
+ *
+ * `markOps` name the result, so a caller emitting them predicts this rebase.
+ * `mapMarks(content, bundle)` runs it instead: pass the bundle's text-moving
+ * channels, diff the marks it returns against the ones you intend, and emit
+ * only the difference. Reproducing the rule by hand is a second copy to drift.
  */
 export interface ChangeBundle {
     delta?: Delta;
@@ -491,7 +508,7 @@ export interface Diagnostic {
     message: string;
     location?: Location;
     /**
-     * Document-model path anchor (e.g. `\"cards.indorsement[0].signature_block\"`),
+     * Document-model path anchor (e.g. `"cards.indorsement[0].signature_block"`),
      * set on schema validation diagnostics and `undefined` otherwise.
      */
     path?: string;
@@ -536,6 +553,10 @@ export class Document {
      * Throws on an out-of-range card, a field that is not richtext, a malformed
      * bundle, or an op that applies out of bounds; the value is unchanged on a
      * failed apply.
+     *
+     * Each text-moving channel rebases the marks already in the field, by the
+     * rule on `ChangeBundle`; `mapMarks` answers where they land, so a caller
+     * building `markOps` need not predict it.
      */
     applyChange(addr: Addr | string, bundle: ChangeBundle): void;
     /**
@@ -975,11 +996,31 @@ export function formatDocPath(segs: DocPathSeg[]): string;
  */
 export function importMarkdown(markdown: string): Content;
 
+/**
+ * Where `bundle`'s text-moving channels (`delta`, then `islandOps`, then
+ * `lineOps`) leave `content`'s marks: the final-text coordinates the bundle's
+ * `markOps` are written in, under the rebase rule stated on `ChangeBundle`.
+ * The document-free read an editor diffs against to decide which `markOps` to
+ * emit, rather than reproducing that rule in its own language.
+ *
+ * `bundle.markOps` are ignored. The answer is normalized, as the store's is:
+ * marks a text move drops (out of range, zero-width formatting) are absent,
+ * and same-kind runs a move left adjacent arrive already unioned, so a bundle
+ * carrying no `markOps` names the marks the field will hold.
+ * Throws on a non-content `content`, a malformed bundle, or an op that applies
+ * out of bounds: `applyChange`'s errors on the same ops.
+ */
+export function mapMarks(content: Content, bundle: ChangeBundle): ContentMark[];
+
 /**
  * Map a base content position (a USV index into `Content.text`, not a UTF-16
  * offset) through a `delta` to its new position, holding a caret stable across
  * a `revise`. `assoc` decides the side of a same-position insertion (`"after"`
  * moves past it). Throws on a malformed `delta`.
+ *
+ * This maps a position the *caller* holds. For the marks already in a field,
+ * `mapMarks` applies the store's own assoc rule across every channel of a
+ * `ChangeBundle`.
  */
 export function mapPos(delta: Delta, pos: number, assoc: Assoc): number;
 
@@ -1070,6 +1111,7 @@ export interface InitOutput {
     readonly exportMarkdown: (a: number, b: number) => void;
     readonly formatDocPath: (a: number, b: number) => void;
     readonly importMarkdown: (a: number, b: number, c: number) => void;
+    readonly mapMarks: (a: number, b: number, c: number) => void;
     readonly mapPos: (a: number, b: number, c: number, d: number) => void;
     readonly parseDocPath: (a: number, b: number, c: number) => void;
     readonly quill_backendId: (a: number, b: number) => void;