@jxsuite/studio 6.1.0 → 6.1.2

package/src/canvas/iframe-inline-edit.ts

@@ -51,11 +51,21 @@ import type {
   SerializableRect,
 } from "./iframe-protocol";
 import type { DocPos } from "./iframe-position";
+import { isNonNullObject, isString } from "@jxsuite/schema/guards";
 import type { JxPath } from "../state";
 import type { JxMutableNode } from "@jxsuite/schema/types";
 
+/** The commit a block session posts when its text reaches the document. */
+type EditCommitMsg = Extract<IframeToParent, { kind: "editCommit" }>;
+
+/** The commit a prop-bound session posts for its instance's `$props` value. */
+type EditCommitPropMsg = Extract<IframeToParent, { kind: "editCommitProp" }>;
+
+/** The toolbar commands that toggle an inline tag (every intent but `link` and `insertData`). */
+type InlineFormatCommand = Exclude<ApplyFormatIntent["command"], "link" | "insertData">;
+
 /** Toolbar command → inline tag (mirrors the parent's old `cmdToTag`, now iframe-side). */
-const CMD_TO_TAG: Record<string, string> = {
+const CMD_TO_TAG = {
   bold: "strong",
   code: "code",
   italic: "em",
@@ -63,7 +73,19 @@ const CMD_TO_TAG: Record<string, string> = {
   subscript: "sub",
   superscript: "sup",
   underline: "u",
-};
+} satisfies Record<InlineFormatCommand, string>;
+
+/**
+ * The CSS Custom Highlight API as this realm may or may not provide it. lib.dom declares both
+ * members unconditionally, but happy-dom and non-Chromium engines ship neither.
+ */
+interface HighlightRealm {
+  Highlight?: typeof Highlight;
+  CSS?: { highlights?: HighlightRegistry };
+}
+
+/** The global object, read through the optional shape above so the feature probes stay honest. */
+const highlightRealm: HighlightRealm = globalThis;
 
 /** Inline tags whose active state the snapshot reports (everything except `a`, handled via link). */
 const ACTIVE_TAG_PROBES = ["strong", "em", "u", "del", "sub", "sup", "code"];
@@ -125,19 +147,19 @@ function deliveredOutsideProps(node: JxMutableNode | undefined, prop: string): b
   if (!node) {
     return false;
   }
-  const attrs = node.attributes as Record<string, unknown> | undefined;
+  const attrs = node.attributes;
   if (attrs) {
     if (attrs[`props.${prop}`] !== undefined) {
       return true;
     }
     const reflected = new Set([prop.toLowerCase(), camelToKebab(prop).toLowerCase()]);
-    for (const [name, val] of Object.entries(attrs)) {
-      if (val !== undefined && reflected.has(name.toLowerCase())) {
+    for (const name of Object.keys(attrs)) {
+      if (attrs[name] !== undefined && reflected.has(name.toLowerCase())) {
         return true;
       }
     }
     const payload = attrs["data-jx-props"];
-    if (typeof payload === "string" && payloadNames(payload, prop)) {
+    if (isString(payload) && payloadNames(payload, prop)) {
       return true;
     }
   }
@@ -145,14 +167,14 @@ function deliveredOutsideProps(node: JxMutableNode | undefined, prop: string): b
   if (RESERVED_KEYS.has(prop) || prop.startsWith("$")) {
     return false;
   }
-  return (node as Record<string, unknown>)[prop] !== undefined;
+  return node[prop] !== undefined;
 }
 
 /** Whether a `data-jx-props` JSON payload carries `prop`. Unparseable payloads deliver nothing. */
 function payloadNames(payload: string, prop: string): boolean {
   try {
     const parsed: unknown = JSON.parse(payload);
-    return typeof parsed === "object" && parsed !== null && prop in parsed;
+    return isNonNullObject(parsed) && prop in parsed;
   } catch {
     return false;
   }
@@ -238,11 +260,8 @@ export function startIframeInlineEdit(
    * `Highlight`/`CSS.highlights`, so this is a silent no-op there (and in non-Chromium engines).
    */
   const updateHighlight = () => {
-    const HighlightCtor = (globalThis as { Highlight?: unknown }).Highlight as
-      | (new (range: Range) => unknown)
-      | undefined;
-    const highlights = (globalThis.CSS as unknown as { highlights?: Map<string, unknown> })
-      ?.highlights;
+    const HighlightCtor = highlightRealm.Highlight;
+    const highlights = highlightRealm.CSS?.highlights;
     if (!HighlightCtor || !highlights) {
       return;
     }
@@ -256,9 +275,7 @@ export function startIframeInlineEdit(
 
   /** Tear down the Custom Highlight (on teardown / real editEnd). */
   const clearHighlight = () => {
-    const highlights = (globalThis.CSS as unknown as { highlights?: Map<string, unknown> })
-      ?.highlights;
-    highlights?.delete(HIGHLIGHT_NAME);
+    highlightRealm.CSS?.highlights?.delete(HIGHLIGHT_NAME);
   };
 
   /**
@@ -309,6 +326,9 @@ export function startIframeInlineEdit(
     }
   };
 
+  /** Whether this typing burst's first keystroke has been announced (`editInput`). */
+  let inputAnnounced = false;
+
   const enterEditAt = (el: HTMLElement, path: JxPath) => {
     // Show raw `${expr}` syntax for editing (the render displays it as ❪ expr ❫).
     restoreTemplateExpressions(el);
@@ -316,14 +336,14 @@ export function startIframeInlineEdit(
     startEditing(el, path, {
       // `inPlace` rides along only when set: a release commit is the common case and the flag is
       // Optional, so omitting it keeps the message shape unchanged for every non-tick commit.
-      onCommit: (p, children, textContent, inPlace) =>
-        channel.post({
-          children,
-          kind: "editCommit",
-          path: p,
-          textContent,
-          ...(inPlace ? { inPlace: true } : {}),
-        }),
+      onCommit: (p, children, textContent, inPlace) => {
+        inputAnnounced = false;
+        const commit: EditCommitMsg = { children, kind: "editCommit", path: p, textContent };
+        if (inPlace) {
+          commit.inPlace = true;
+        }
+        channel.post(commit);
+      },
       onEnd: () => {
         clearHighlight();
         lastNonEmptyRange = null;
@@ -351,11 +371,11 @@ export function startIframeInlineEdit(
     if (!shadowDoc) {
       return true;
     }
-    const node = getNodeAtPath(shadowDoc, hostPath) as JxMutableNode | undefined;
+    const node = getNodeAtPath(shadowDoc, hostPath);
     if (deliveredOutsideProps(node, prop)) {
       return false;
     }
-    const raw = (node?.$props as Record<string, unknown> | undefined)?.[prop];
+    const raw = node?.$props?.[prop];
     if (raw == null) {
       return true; // Unset — editing ADDS the prop, overriding the definition default.
     }
@@ -366,7 +386,7 @@ export function startIframeInlineEdit(
      * Objects were already excluded; the scalar cases were not, and are the ones a component
      * actually declares. They stay editable in the properties panel, which knows their type.
      */
-    if (typeof raw !== "string") {
+    if (!isString(raw)) {
       return false;
     }
     return !raw.includes("${");
@@ -383,14 +403,19 @@ export function startIframeInlineEdit(
       el,
       hostPath,
       {
-        onCommit: (p, _children, textContent, inPlace) =>
-          channel.post({
+        onCommit: (p, _children, textContent, inPlace) => {
+          inputAnnounced = false;
+          const commit: EditCommitPropMsg = {
             kind: "editCommitProp",
             path: p,
             prop,
             value: textContent ?? "",
-            ...(inPlace ? { inPlace: true } : {}),
-          }),
+          };
+          if (inPlace) {
+            commit.inPlace = true;
+          }
+          channel.post(commit);
+        },
         onEnd: () => {
           clearHighlight();
           lastNonEmptyRange = null;
@@ -512,6 +537,7 @@ export function startIframeInlineEdit(
     if (start === -1 || end === -1 || end <= start) {
       return false;
     }
+    // SAFETY: `blocksInOrder` selects `[data-jx-path]`, so every block it returns carries the key.
     const between = blocks
       .slice(start + 1, end)
       .map((el) => parseJxPath(el.dataset.jxPath as string));
@@ -566,12 +592,22 @@ export function startIframeInlineEdit(
      owns what a slash MEANS (start of a block or after a space; anywhere else it is punctuation).
      The matching `input` half re-filters the open menu, for the same reason: a contenteditable's
      `input` targets its host, not the block the caret happens to be in. */
-  const onSlashKey = (e: Event) => handleSlashTrigger(e as KeyboardEvent);
+  const onSlashKey = (e: KeyboardEvent) => handleSlashTrigger(e);
   const onSlashInput = () => {
     if (isSlashActive()) {
       refreshSlashMenu();
     }
   };
+  /* Typed text reaches the document on the idle tick, half a second later. The parent hears about
+     the burst on its first keystroke instead, so its Save is not disabled over words a save would
+     keep. Once per burst: the flag re-arms when the burst commits. */
+  const onEditInput = () => {
+    if (!inputAnnounced) {
+      inputAnnounced = true;
+      channel.post({ kind: "editInput" });
+    }
+  };
+  container.addEventListener("input", onEditInput);
   container.addEventListener("keydown", onSlashKey);
   container.addEventListener("input", onSlashInput);
   doc.addEventListener("mouseup", onMouseUp, true);
@@ -639,6 +675,7 @@ export function startIframeInlineEdit(
   return () => {
     container.removeEventListener("keydown", onSlashKey);
     container.removeEventListener("input", onSlashInput);
+    container.removeEventListener("input", onEditInput);
     doc.removeEventListener("mouseup", onMouseUp, true);
     doc.removeEventListener("keyup", onKeyUp, true);
     doc.removeEventListener("blur", onBlurCapture, true);

package/src/canvas/iframe-insert.ts

@@ -17,6 +17,7 @@
  * (happy-dom's `elementFromPoint` returns null) and lives in iframe-interaction.
  */
 
+import { isNumber } from "@jxsuite/schema/guards";
 import { parseJxPath } from "./path-mapping";
 import { rectOf } from "../utils/geometry";
 import { childIndex, parentElementPath } from "../state";
@@ -48,7 +49,7 @@ function isRowLayout(parent: HTMLElement): boolean {
   const isGrid = display === "grid" || display === "inline-grid";
   return (
     (isFlex && style.flexDirection.startsWith("row")) ||
-    (isGrid && (style.gridAutoFlow ?? "").startsWith("column"))
+    (isGrid && style.gridAutoFlow.startsWith("column"))
   );
 }
 
@@ -78,11 +79,11 @@ export function computeInsertZones(
   shadowDoc: JxMutableNode,
 ): InsertZone[] | null {
   void shadowDoc;
-  const serialized = targetEl.dataset?.jxPath;
+  const serialized = targetEl.dataset.jxPath;
   if (serialized == null) {
     return null;
   }
-  const targetPath = parseJxPath(serialized) as JxPath;
+  const targetPath = parseJxPath(serialized);
 
   // Empty container: one centered "+" that inserts as the container's first child.
   if (targetEl.classList.contains(EMPTY_CONTAINER_CLASS)) {
@@ -99,7 +100,7 @@ export function computeInsertZones(
     return null;
   }
   const childIdx = childIndex(targetPath);
-  if (typeof childIdx !== "number") {
+  if (!isNumber(childIdx)) {
     return null;
   }
 

package/src/canvas/iframe-interaction.ts

@@ -7,6 +7,7 @@
  */
 
 import { jxPathSelector, parseJxPath, serializeJxPath } from "./path-mapping";
+import { isFunction } from "@jxsuite/schema/guards";
 import { rectOf } from "../utils/geometry";
 import { computeInsertZones, insertZonesKey } from "./iframe-insert";
 import { getActiveElement, isEditing } from "../editor/inline-edit";
@@ -32,9 +33,10 @@ function isCanvasLeave(e: Event, doc: Document): boolean {
 
 /** Walk up from an element to the nearest ancestor carrying a `data-jx-path`; null if none. */
 function nearestPathEl(start: Element | null): HTMLElement | null {
-  let el = start instanceof Element ? (start as HTMLElement) : null;
+  let el = start instanceof Element ? start : null;
   while (el) {
-    if (el.dataset?.jxPath) {
+    // Only HTML elements are stamped (`makeStamper` skips everything else), so only they can match.
+    if (el instanceof HTMLElement && el.dataset.jxPath) {
       return el;
     }
     el = el.parentElement;
@@ -57,6 +59,7 @@ export function nearestHit(target: EventTarget | null): NodeHit | null {
   if (!el) {
     return null;
   }
+  // SAFETY: nearestPathEl returns only an element whose `data-jx-path` is a non-empty string.
   return measureHit(el, el.dataset.jxPath as string);
 }
 
@@ -75,8 +78,9 @@ export function nearestHit(target: EventTarget | null): NodeHit | null {
  * from a node that is on screen is a worse failure than drawing one for a node that is not.
  */
 function isRendered(el: Element): boolean {
-  const check = (el as { checkVisibility?: (o?: object) => boolean }).checkVisibility;
-  return typeof check === "function" ? check.call(el, { checkVisibilityCSS: true }) : true;
+  // Absent on engines that predate it, whatever lib.dom says.
+  const check: Element["checkVisibility"] | undefined = el.checkVisibility;
+  return isFunction(check) ? check.call(el, { checkVisibilityCSS: true }) : true;
 }
 
 /**
@@ -92,10 +96,7 @@ function isRendered(el: Element): boolean {
  * The serialized path is the same string the renderer stamps, so a stored selection path
  * round-trips back to its element.
  */
-export function measureHits(
-  paths: (string | number)[][],
-  doc: Document = document,
-): { hits: NodeHit[]; hidden: (string | number)[][] } {
+export function measureHits(paths: (string | number)[][], doc: Document = document) {
   const hits: NodeHit[] = [];
   const hidden: (string | number)[][] = [];
   for (const path of paths) {
@@ -119,8 +120,15 @@ export function measureHits(
  * {@link file://./iframe-drop.ts}'s `startGrabDetector` receives its deps rather than reaching for
  * module state.
  */
+type InvokerAction = Extract<IframeToParent, { kind: "popoverTargetClick" }>["action"];
+
 /** The three `popovertargetaction` keywords. Anything else falls back to the HTML default. */
-const INVOKER_ACTIONS = new Set(["toggle", "show", "hide"]);
+const INVOKER_ACTIONS = new Set<string>(["toggle", "show", "hide"] satisfies InvokerAction[]);
+
+/** Whether an attribute value is one of the {@link INVOKER_ACTIONS} keywords. */
+function isInvokerAction(value: string): value is InvokerAction {
+  return INVOKER_ACTIONS.has(value);
+}
 
 /**
  * Report an invoker click, when the click landed on one and it names an addressable popover.
@@ -152,14 +160,14 @@ function postPopoverInvoke(
      need escaping — a rule this file already keeps in exactly one place (`jxPathSelector`) and
      should not gain a second spelling of. The set scanned is the addressable POPOVERS, which is
      also the set the answer has to come from, so the scan is the test. */
-  const panels = invoker.ownerDocument.querySelectorAll("[data-jx-popover]");
-  const panel = [...panels].find((el) => el.id === id) as HTMLElement | undefined;
+  const panels = invoker.ownerDocument.querySelectorAll<HTMLElement>("[data-jx-popover]");
+  const panel = [...panels].find((el) => el.id === id);
   const serialized = panel?.dataset.jxPath;
   if (!serialized) {
     return;
   }
   const raw = invoker.getAttribute("popovertargetaction") ?? "toggle";
-  const action = INVOKER_ACTIONS.has(raw) ? (raw as "toggle" | "show" | "hide") : "toggle";
+  const action = isInvokerAction(raw) ? raw : "toggle";
   channel.post({ action, kind: "popoverTargetClick", targetPath: parseJxPath(serialized) });
 }
 
@@ -190,10 +198,10 @@ function postCommandInvoke(
   }
   // Scanned, not selected, for the reason `postPopoverInvoke` gives; the addressable overlays are
   // The de-popovered panels and the stamped dialogs.
-  const overlays = invoker.ownerDocument.querySelectorAll(
+  const overlays = invoker.ownerDocument.querySelectorAll<HTMLElement>(
     "[data-jx-popover], dialog[data-jx-path]",
   );
-  const overlay = [...overlays].find((el) => el.id === id) as HTMLElement | undefined;
+  const overlay = [...overlays].find((el) => el.id === id);
   const serialized = overlay?.dataset.jxPath;
   if (!serialized) {
     return;
@@ -270,7 +278,7 @@ export function startInteraction(
     channel.post({ kind: "paneFocus" });
   };
 
-  const onClick = (e: Event) => {
+  const onClick = (e: MouseEvent) => {
     /*
      * Preview keeps anchors live, so a click would navigate this iframe and destroy the render (and
      * the editing session with it). Report the intent so the parent can open the real page in a real
@@ -278,7 +286,8 @@ export function startInteraction(
      * rather than replacing the canvas with a half-loaded page.
      *
      * Design/edit never reach this: the runtime de-links anchors onto `data-jx-href` there, so there
-     * is no navigation to intercept and a click means "select this element".
+     * is no navigation to intercept and a click means "select this element". Project Styles keeps
+     * its specimens' links live and refuses the navigation just below.
      */
     if (isPreview()) {
       if (e.target instanceof Element) {
@@ -292,14 +301,18 @@ export function startInteraction(
       // No hit post: a click in preview is a click on the page, never a selection.
       return;
     }
+    // Project Styles keeps its link specimen live (`iframe-render.ts`), so a click on it must
+    // Select it rather than follow it.
+    if (deps?.getMode?.() === "stylebook" && e.target instanceof Element && e.target.closest("a")) {
+      e.preventDefault();
+    }
     const hit = nearestHit(e.target);
     if (hit) {
       // Ctrl/Cmd is the accumulate gesture (studio-ui-guidelines.md §8.1). The iframe reports the
       // Modifier and nothing else — it holds no selection state, so what a modified click MEANS is
       // The parent's to decide, exactly as the unmodified click already was.
-      const mouse = e as MouseEvent;
       channel.post({
-        additive: mouse.ctrlKey === true || mouse.metaKey === true,
+        additive: e.ctrlKey === true || e.metaKey === true,
         hit,
         kind: "hit",
       });
@@ -388,11 +401,10 @@ export function startInteraction(
     reportInsertZones(target, { x: moveX, y: moveY });
   };
 
-  const onMove = (e: Event) => {
-    const pe = e as PointerEvent;
+  const onMove = (e: PointerEvent) => {
     moveTarget = e.target;
-    moveX = pe.clientX;
-    moveY = pe.clientY;
+    moveX = e.clientX;
+    moveY = e.clientY;
     if (movePending) {
       return;
     }
@@ -409,8 +421,7 @@ export function startInteraction(
     }
   };
 
-  const onContextMenu = (e: Event) => {
-    const me = e as MouseEvent;
+  const onContextMenu = (e: MouseEvent) => {
     // Preview keeps the NATIVE menu: the Jx element menu's verbs (duplicate, delete, paste, wrap)
     // Are document edits, and preview does not edit. Copy Link Address does what it says instead.
     if (isPreview()) {
@@ -441,8 +452,8 @@ export function startInteraction(
     channel.post({
       kind: "contextMenu",
       path: hit.path,
-      x: me.clientX,
-      y: me.clientY,
+      x: e.clientX,
+      y: e.clientY,
     });
   };
 

package/src/canvas/iframe-overlay.ts

@@ -47,7 +47,7 @@ export function parentCursorToIframe(
   cursor: { x: number; y: number },
   iframeRect: { left: number; top: number },
   scale = 1,
-): { x: number; y: number } {
+) {
   return {
     x: (cursor.x - iframeRect.left) / scale,
     y: (cursor.y - iframeRect.top) / scale,

package/src/canvas/iframe-patch.ts

@@ -15,7 +15,8 @@
  */
 
 import { reapplyStyle } from "@jxsuite/runtime";
-import { getNodeAtPath } from "../state";
+import { isNonNullObject, isNumber, isString } from "@jxsuite/schema/guards";
+import { getNodeAtPath } from "@jxsuite/schema/doc-ops";
 import { applyDocOpToDoc } from "../tabs/doc-op-apply";
 import { parseJxPath, serializeJxPath } from "./path-mapping";
 import { disposeSubtree, renderSubtreeIframe } from "./iframe-subtree";
@@ -25,7 +26,7 @@ import {
   templateToEditDisplay,
 } from "../utils/edit-display";
 import type { IframeRenderCtx } from "./iframe-render";
-import type { WireDocOp } from "./iframe-protocol";
+import type { JxDocOp } from "../tabs/patch-ops";
 import type { JxPath } from "../state";
 import type { JxMutableNode, JxStyle } from "@jxsuite/schema/types";
 
@@ -36,7 +37,7 @@ import type { JxMutableNode, JxStyle } from "@jxsuite/schema/types";
  */
 export function applyIframePatch(
   shadowDoc: JxMutableNode,
-  forwardOps: WireDocOp[],
+  forwardOps: JxDocOp[],
   container: HTMLElement,
   ctx?: IframeRenderCtx,
   echoPaths?: JxPath[],
@@ -98,7 +99,7 @@ function requireCtx(ctx: IframeRenderCtx | undefined): IframeRenderCtx {
 
 function applyOpToDom(
   doc: JxMutableNode,
-  op: WireDocOp,
+  op: JxDocOp,
   container: HTMLElement,
   ctx: IframeRenderCtx | undefined,
 ): void {
@@ -138,7 +139,7 @@ function applyOpToDom(
       return;
     }
     default: {
-      // The WireDocOp union is exhaustively handled above; this guards a future op kind.
+      // The JxDocOp union is exhaustively handled above; this guards a future op kind.
       throw new Error(`iframe-patch-unsupported-op:${JSON.stringify(op)}`);
     }
   }
@@ -292,7 +293,7 @@ function remapChildPaths(
       continue;
     }
     const idx = p[depth + 1];
-    if (typeof idx !== "number" || idx < fromIndex) {
+    if (!isNumber(idx) || idx < fromIndex) {
       continue;
     }
     if (!parentPath.every((seg, i) => p[i] === seg)) {
@@ -338,7 +339,9 @@ function patchStyle(
 ): void {
   const el = requireElement(container, path);
   const node = getNodeAtPath(doc, path);
-  const mediaQueries = (ctx?.defs?.["$media"] as Record<string, string> | undefined) ?? {};
+  /* SAFETY: buildScope writes `$media` only from the document's own `$media` map or the runtime's
+   * root media map, both Record<string, string>, and the host scope may not supply the key. */
+  const mediaQueries = (ctx?.defs["$media"] as Record<string, string> | undefined) ?? {};
   reapplyStyle(el, editModeStyle(node?.style), mediaQueries);
 }
 
@@ -372,20 +375,20 @@ function findElement(container: HTMLElement, path: (string | number)[]): HTMLEle
  * top-level template-string values are blanked so no reactive bindings are created for them.
  */
 function editModeStyle(style: JxStyle | undefined): JxStyle | undefined {
-  if (!style || typeof style !== "object") {
+  if (!style || !isNonNullObject(style)) {
     return undefined;
   }
-  const out: Record<string, unknown> = {};
+  const out: JxStyle = {};
   for (const [k, v] of Object.entries(style)) {
     /* OMITTED, not blanked. It used to be written as `""`, which was a silent no-op while a
        declaration went to `el.style` and is a malformed declaration now that it goes into a rule.
        Dropping the key is what blanking always meant: the property falls back to the cascade. */
-    if (typeof v === "string" && v.includes("${")) {
+    if (isString(v) && v.includes("${")) {
       continue;
     }
     out[k] = v;
   }
-  return out as JxStyle;
+  return out;
 }
 
 /**
@@ -393,15 +396,15 @@ function editModeStyle(style: JxStyle | undefined): JxStyle | undefined {
  * template-string and $ref display rules (and the legacy patcher's textDisplayValue).
  */
 function textDisplayValue(node: JxMutableNode | undefined): string {
-  const v = (node as { textContent?: unknown } | undefined)?.textContent;
+  const v = node?.textContent;
   if (v == null) {
     return "";
   }
-  if (typeof v === "string") {
+  if (isString(v)) {
     return v.includes("${") ? templateToEditDisplay(v) : v;
   }
-  if (typeof v === "object" && (v as Record<string, unknown>).$ref) {
-    const ref = String((v as Record<string, unknown>).$ref);
+  if (isNonNullObject(v) && v.$ref) {
+    const ref = String(v.$ref);
     const label = ref.startsWith("#/state/") ? ref.slice(8) : ref;
     return `{${label}}`;
   }

package/src/canvas/iframe-position.ts

@@ -33,6 +33,12 @@ export interface DocRange {
   head: DocPos;
 }
 
+/** A live DOM caret position: a node and an offset into it, as a Selection endpoint carries. */
+export interface DomPosition {
+  node: Node;
+  offset: number;
+}
+
 /** Whether an element is a block the caret may live inside. Injected so the editable set is policy. */
 export type EditablePredicate = (el: HTMLElement) => boolean;
 
@@ -91,7 +97,7 @@ export function elementForPath(container: HTMLElement, path: JxPath): HTMLElemen
 
 /** The block's rendered text length — the maximum valid offset within it. */
 export function blockTextLength(block: HTMLElement): number {
-  return block.textContent?.length ?? 0;
+  return block.textContent.length;
 }
 
 /**
@@ -126,11 +132,12 @@ export function offsetOf(block: HTMLElement, node: Node, offset: number): number
  * every offset-based editor carries at a line break, and it is invisible for the paths that use
  * this (caret restore after a patch, and block-boundary edits, which clamp to 0 / length anyway).
  */
-export function domPositionAt(block: HTMLElement, offset: number): { node: Node; offset: number } {
+export function domPositionAt(block: HTMLElement, offset: number): DomPosition {
   const target = Math.max(0, Math.min(offset, blockTextLength(block)));
   const walker = block.ownerDocument.createTreeWalker(block, NodeFilter.SHOW_TEXT);
   let seen = 0;
   let last: Text | null = null;
+  // SAFETY: the walker was created with NodeFilter.SHOW_TEXT, so every node it yields is a Text.
   let current = walker.nextNode() as Text | null;
   while (current) {
     const len = current.length;
@@ -139,6 +146,7 @@ export function domPositionAt(block: HTMLElement, offset: number): { node: Node;
     }
     seen += len;
     last = current;
+    // SAFETY: the same SHOW_TEXT walker as above, so the next node is a Text or the walk's end.
     current = walker.nextNode() as Text | null;
   }
   // No text node reaches the target: either the block has no text at all (caret goes to the element
@@ -169,10 +177,7 @@ export function toDocPos(
  * block whose text shrank under a remote edit lands at the block's new end instead of being
  * dropped.
  */
-export function toDomPosition(
-  container: HTMLElement,
-  pos: DocPos,
-): { node: Node; offset: number } | null {
+export function toDomPosition(container: HTMLElement, pos: DocPos): DomPosition | null {
   const el = elementForPath(container, pos.path);
   return el ? domPositionAt(el, pos.offset) : null;
 }
@@ -246,6 +251,7 @@ export function adjacentBlock(
   const key = serializeJxPath(path);
   const index = blocks.findIndex((el) => el.dataset.jxPath === key);
   const neighbour = index === -1 ? undefined : blocks[index + direction];
+  // SAFETY: blocksInOrder collects only elements matching `[data-jx-path]`, so the attribute is set.
   return neighbour
     ? { el: neighbour, path: parseJxPath(neighbour.dataset.jxPath as string) }
     : null;