@volter/editor-blender 0.1.150 → 0.1.151

package/contributions/blender-node-geometry.ts

@@ -1,31 +1,4 @@
-/**
- * BLENDER'S NODE EDITOR, AS NUMBERS — the geometry and the colours the node
- * view draws with, each one READ from Blender 5.2.0's own source at the
- * engine's pin (`fbe6228777e7`) and cited beside it.
- *
- * WORK.md §Blender in the tab is Blender, "Inspection parity", I5;
- * ARCHITECTURE-CORE §Blender north star, "Inspection parity, not editing
- * parity" and "The reference is Blender's SOURCE as well as its frames".
- * Blender's own drawing code is never run, ported as a UI system, or
- * recorded — it is READ as the specification of what to draw, which is what
- * every citation below is doing.
- *
- * THE SCALE. Every constant here is stated at `UI_SCALE_FAC = 1` and
- * `U.pixelsize = 1`, which makes `U.widget_unit = int(round(18 * 1)) + 2 * 1`
- * = **20** (`windowmanager/intern/wm_window.cc:779`). The node editor draws
- * WITHOUT DPI — "Nodes draw without DPI - the view zoom is flexible", the
- * comment above the macro block (`space_node/node_intern.hh:332`) — so a node's
- * tree-space size is these numbers exactly and the VIEW's zoom is the only
- * scale between them and the screen.
- *
- * WHY THE LAYOUT IS COMPUTED HERE AND NOT READ. `Node.dimensions` is RNA's
- * answer for a node's drawn size, and it is `bNode.runtime->draw_bounds`,
- * which only the node editor's own draw pass fills in. Measured 2026-09-19 on
- * the engine in the tab: every node of a freshly built Principled material
- * answers `dimensions == [0, 0]`, because this Blender has no node editor
- * region and never will. So the height is derived the way
- * `node_update_basis` derives it, from facts RNA does answer.
- */
+
 
 /* -------------------------------------------------------------------------- */
 /* Geometry — `space_node/node_intern.hh:332-344`                             */
@@ -65,10 +38,6 @@ export const NODE_ITEM_SPACING_Y = 0.1 * WIDGET_UNIT;
 /** `#define NODE_HEADER_ICON_SIZE (0.8f * U.widget_unit)` (`node_draw.cc:2143`). */
 export const NODE_HEADER_ICON_SIZE = 0.8 * WIDGET_UNIT;
 
-/** `#define NODE_MULTI_INPUT_LINK_GAP (0.25f * U.widget_unit)`
- *  (`node_intern.hh:341`) — how far apart a multi-input socket fans its links. */
-export const NODE_MULTI_INPUT_LINK_GAP = 0.25 * WIDGET_UNIT;
-
 /** The 0.5 every filled rect is grown by "to prevent transparent gaps with the
  *  outline" (`node_draw.cc:2920`), and the radius that goes with it. */
 export const NODE_FILL_PADDING = 0.5;
@@ -77,20 +46,10 @@ export const NODE_FILL_RADIUS = BASIS_RAD + NODE_FILL_PADDING;
  *  (`node_draw.cc:3184-3211`). */
 export const NODE_OUTLINE_RADIUS = BASIS_RAD + PIXEL_SIZE;
 
-/** `NODE_GRID_UNIT` (`editors/include/ED_node_c.hh:31-32`) — the dot grid's
- *  finest step, and the snapping unit. */
-export const NODE_GRID_STEP = 20;
-
 /** `LINK_WIDTH` (`space_node/drawnode.cc:1959`) — a noodle's stroke at 100 %,
  *  clamped never to go below this as the view zooms out
  *  (`drawnode.cc:2299-2302`); a FIELD link draws at 0.7 of it. */
 export const LINK_WIDTH = 2.5;
-export const LINK_FIELD_WIDTH_FACTOR = 0.7;
-
-/** `NODE_LINK_RESOL` (`node_intern.hh:343`) — how many segments Blender's own
- *  CPU evaluation of a noodle uses. SVG draws the cubic itself, so this is
- *  here as the record of what the reference samples, not as a step count. */
-export const NODE_LINK_RESOL = 12;
 
 /** `NODE_TREE_SCALE_SMALL` (`node_draw.cc:1596`) — below `1/aspect > 0.2`,
  *  `draw_node_details` is false and Blender draws NO sockets, no reroute
@@ -113,7 +72,6 @@ export const REROUTE_RADIUS = NODE_SOCKSIZE;
  *  margin)`, and the baseline sits `0.5 * margin_top + 0.35 * label_size`
  *  below the top (`node_draw.cc:3474-3484`). */
 export const FRAME_MARGIN = 1.5 * WIDGET_UNIT;
-export const FRAME_LABEL_SIZE_DEFAULT = 20;
 
 /** The label's point size — `UI_DEFAULT_TEXT_POINTS` (`UI_interface_c.hh:425`),
  *  which `style->widget` takes (`interface_style.cc:91`). A node's name is an
@@ -128,30 +86,12 @@ export const UI_TEXT_POINTS = 11;
 /** Every value is the DEFAULT THEME's, by member and line. A member absent
  *  from the initializer takes the struct's zero and is called out. */
 export const NODE_THEME = {
-  /** `wcol_numslider.item` — the FILLED portion of a number slider's back
-   *  (`widget_numslider`, `interface_widgets.cc`, which draws the item rect to
-   *  the value's proportion before the text).
-   *
-   *  SAMPLED FROM THE FRAME, not recalled: `rgb(70,113,178)` at the Roughness
-   *  and Alpha fills on Blender 5.2.0 LTS's own shader editor at 2x, against
-   *  `rgb(83,83,83)` in the same row's unfilled remainder. It is BLUE — the
-   *  playhead's family — and the first pass here guessed a grey a step lighter
-   *  than the field, drew it, and produced a slider nobody could see. The
-   *  frame was on screen the whole time. */
+  /** wcol_numslider.item fills the value’s fraction of the slider; source colour is rgb(70,113,178). */
   sliderFill: '#4671b2',
   /** `.back` `0x1a1a1a00` (`:653`). The alpha is 0x00 and IRRELEVANT:
    *  `draw_background_color` clears with the RGB and a hard 1.0
    *  (`node_draw.cc:4713-4718`), so the canvas is opaque #1a1a1a. */
   background: '#1a1a1a',
-  /** `.grid` `0x30303000` (`:661`) — alpha ZERO. Blender's dot grid is
-   *  therefore INVISIBLE under the shipped theme, and drawing one here would
-   *  be a mark the reference does not make. `.grid_levels` is 3 (`:671`) and
-   *  the draw is `view2d_dot_grid_draw(&v2d, TH_GRID, NODE_GRID_STEP_SIZE,
-   *  grid_levels)` (`node_draw.cc:4755-4756`) — a DOT grid, not
-   *  `UI_view2d_multi_grid_draw`, which the node editor does not call. */
-  grid: '#303030',
-  gridAlpha: 0,
-  gridLevels: 3,
   /** `.syntaxl` `0x303030ff` (`:673`), which `resources.cc:659-660` returns
    *  for `TH_NODE`. EVERY node's BODY is this colour whatever its class
    *  (`node_draw.cc:3149`); only the header carries the class hue. */
@@ -171,11 +111,6 @@ export const NODE_THEME = {
   /** `.wire` `0x1a1a1aff` (`:662`) → `TH_WIRE`: a noodle's OUTLINE
    *  (`drawnode.cc:2309`) and a socket's outline (`node_draw.cc:1502-1505`). */
   wire: '#1a1a1a',
-  /** `.edge_select` `0xffffffb3` (`:665`), whose Python name IS `wire_select`
-   *  (`rna_userdef.cc:3604-3605`) — a SELECTED noodle blends toward this by
-   *  its own alpha (`drawnode.cc:2338-2352`). */
-  wireSelect: '#ffffff',
-  wireSelectAlpha: 0xb3 / 255,
   /** `.noodle_curving` `4` (`:670`) → `TH_NODE_CURVING`
    *  (`resources.cc:713-714`). NOTE the divergence worth recording: RNA's
    *  property default is 5 (`rna_userdef.cc:3658-3663`), but the SHIPPED THEME
@@ -293,7 +228,6 @@ export interface LaidOutSocket {
   readonly shape: string;
   readonly output: boolean;
   readonly linked: boolean;
-  readonly multiInput: boolean;
   readonly hideValue: boolean;
   readonly value: number | string | boolean | readonly number[] | null;
   /** See {@link LayoutSocketInput.softMin} — carried through so the inline
@@ -314,7 +248,6 @@ export interface LaidOutSocket {
 }
 
 export interface LaidOutNode {
-  readonly name: string;
   readonly x: number;
   readonly yTop: number;
   readonly yBottom: number;
@@ -333,7 +266,6 @@ interface LayoutSocketInput {
   readonly hide: boolean;
   readonly hideValue: boolean;
   readonly linked: boolean;
-  readonly multiInput: boolean;
   readonly value: number | string | boolean | readonly number[] | null;
   /** The `default_value` property's SOFT range, present only when the socket
    *  is a bounded scalar — which is exactly Blender's own test for drawing a
@@ -343,8 +275,7 @@ interface LayoutSocketInput {
 }
 
 interface LayoutNodeInput {
-  readonly name: string;
-  readonly location: readonly number[];
+  readonly location: readonly [number, number];
   readonly width: number;
   readonly collapsed: boolean;
   readonly inputs: readonly LayoutSocketInput[];
@@ -357,43 +288,10 @@ export function socketDraws(socket: LayoutSocketInput): boolean {
   return socket.enabled && !socket.hide;
 }
 
-/**
- * ONE NODE, LAID OUT — `node_update_basis` (`node_draw.cc:1288-1324`) run
- * over the facts RNA answers.
- *
- * ```
- * loc = node.location            node_draw.cc:1295
- * dy  = loc.y                    node_draw.cc:1297
- * dy -= NODE_DY                  node_draw.cc:1300   // the header, exactly 20
- * …outputs, then inputs…
- * xmin = loc.x ; xmax = loc.x + NODE_WIDTH(node)     node_draw.cc:1309-1310
- * ymax = loc.y ; ymin = min(dy, loc.y - 2 * NODE_DY) node_draw.cc:1311-1312
- * ```
- * — so a node is never shorter than two header-heights, 40.
- *
- * WHICH OF BLENDER'S TWO BODY PATHS THIS IS, and the one divergence it
- * carries. `node_update_basis` branches on `is_node_panels_supported()` =
- * `decl->use_custom_socket_order` (`node_draw.cc:343-346, 1302-1307`):
- *
- *  - the DECLARATION path (`node_update_basis_from_declaration`, `:1086-1218`)
- *    spaces items through one margin table in units of `NODE_ITEM_SPACING_Y`
- *    (`:886-1000`): 2× before the first socket, 1× between two sockets, 2×
- *    after the last;
- *  - the LEGACY path (`node_update_basis_from_socket_lists`, `:1227-1283`)
- *    uses `NODE_DYS / 2` = 5 at the top, `NODE_ITEM_SPACING_Y` between
- *    sockets, `NODE_DY / 4` = 5 between the outputs and the inputs, and
- *    `NODE_DYS / 2` = 5 at the bottom.
- *
- * RNA EXPOSES NO `use_custom_socket_order`, so this cannot be read from the
- * engine. The declaration path is the one Blender 5.2 lays nearly every
- * built-in node out with, so it is the one implemented, and the cost is
- * STATED rather than hidden: a node Blender lays out the legacy way sits
- * 1 px lower at its first socket, 3 px lower at its first input, and ends
- * 1 px further down — at most 5 px over a whole node.
- */
+/** Default node geometry uses declaration socket spacing: location anchors the top-left, the header is NODE_DY high, and the body is at least two headers tall. Traced custom-order declarations use layoutNodeWithPanels. */
 export function layoutNode(node: LayoutNodeInput): LaidOutNode {
-  const x = node.location[0] ?? 0;
-  const top = node.location[1] ?? 0;
+  const x = node.location[0];
+  const top = node.location[1];
   const width = node.width;
   const outputs = node.outputs.filter(socketDraws);
   const inputs = node.inputs.filter(socketDraws);
@@ -413,7 +311,6 @@ export function layoutNode(node: LayoutNodeInput): LaidOutNode {
       });
     };
     return {
-      name: node.name,
       x,
       yTop,
       yBottom,
@@ -444,9 +341,7 @@ export function layoutNode(node: LayoutNodeInput): LaidOutNode {
   });
   if (outputs.length > 0 && inputs.length > 0) dy -= NODE_ITEM_SPACING_Y;
   inputs.forEach((socket, index) => {
-    if (index > 0 || outputs.length > 0) {
-      if (index > 0) dy -= NODE_ITEM_SPACING_Y;
-    }
+    if (index > 0) dy -= NODE_ITEM_SPACING_Y;
     row(socket, false);
   });
   if (outputs.length > 0 || inputs.length > 0) {
@@ -456,7 +351,6 @@ export function layoutNode(node: LayoutNodeInput): LaidOutNode {
   }
 
   return {
-    name: node.name,
     x,
     yTop: top,
     // `ymin = min_ff(dy, loc.y - 2 * NODE_DY)` — node_draw.cc:1311.
@@ -482,7 +376,6 @@ function socketAt(
     shape: socket.shape,
     output,
     linked: socket.linked,
-    multiInput: socket.multiInput,
     hideValue: socket.hideValue,
     value: socket.value,
     ...(socket.softMin === undefined ? {} : { softMin: socket.softMin }),
@@ -513,14 +406,8 @@ function socketAt(
 export function linkHandles(
   from: readonly [number, number],
   to: readonly [number, number],
-  curving: number = NODE_THEME.noodleCurving,
 ): [[number, number], [number, number]] {
-  if (curving === 0) {
-    return [
-      [from[0] + (to[0] - from[0]) / 3, from[1] + (to[1] - from[1]) / 3],
-      [from[0] + ((to[0] - from[0]) * 2) / 3, from[1] + ((to[1] - from[1]) * 2) / 3],
-    ];
-  }
+  const curving = NODE_THEME.noodleCurving;
   const distX = Math.abs(to[0] - from[0]);
   const distY = Math.abs(to[1] - from[1]);
   // `slope` divides by dist_x; Blender's own code does the same and relies on
@@ -562,18 +449,18 @@ export function nodeHeaderColor(node: {
  *  (`node_draw.cc:3145-3149`). */
 export function nodeBodyColor(node: {
   readonly useCustomColor: boolean;
-  readonly color: readonly number[];
+  readonly color: readonly [number, number, number];
 }): string {
   if (!node.useCustomColor) return NODE_THEME.body;
   return rgbFloatsToHex(node.color);
 }
 
-export function rgbFloatsToHex(channels: readonly number[]): string {
+export function rgbFloatsToHex(channels: readonly [number, number, number, ...number[]]): string {
   const byte = (value: number): string =>
     Math.round(Math.min(1, Math.max(0, value)) * 255)
       .toString(16)
       .padStart(2, '0');
-  return `#${byte(channels[0] ?? 0)}${byte(channels[1] ?? 0)}${byte(channels[2] ?? 0)}`;
+  return `#${byte(channels[0])}${byte(channels[1])}${byte(channels[2])}`;
 }
 
 /**
@@ -609,22 +496,9 @@ export function socketColor(type: string): string {
 /* SOCKET PANELS — `node_update_basis_from_declaration`'s other half           */
 /* -------------------------------------------------------------------------- */
 
-/**
- * A PANEL HEADER'S ROW, in the layout: `NODE_DYS` tall, its centre exactly
- * half that below where the row starts — `locy -= h/2; center = locy;
- * locy -= h/2` (`node_draw.cc:1189-1195`). It is HALF a socket row, which is
- * the whole reason eight collapsed panels cost 160 px where their thirty
- * sockets cost 660.
- */
+/** A panel-header row is NODE_DYS tall, half a socket row (node_draw.cc:1189-1195). */
 export const PANEL_HEADER_HEIGHT = NODE_DYS;
 
-/**
- * The header's DRAWN band is twice its laid-out height — `center ± NODE_DYS`
- * (`node_draw.cc:2005-2008`) — so two consecutive headers' bands abut exactly
- * at the 20-unit pitch they sit at.
- */
-export const PANEL_HEADER_BAND = 2 * NODE_DYS;
-
 /** `header_but_margin = NODE_MARGIN_X / 3` — where the triangle starts, and
  *  the inset the whole header button takes (`node_draw.cc:2031-2038`). */
 export const PANEL_HEADER_MARGIN_X = NODE_MARGIN_X / 3;
@@ -635,34 +509,7 @@ export const PANEL_HEADER_BUT_PADDING = NODE_MARGIN_X / 4;
  *  (`node_draw.cc:2059-2078`). */
 export const UI_UNIT_X = WIDGET_UNIT;
 
-/**
- * BLENDER'S PANEL TRIANGLE, as geometry rather than as a lookalike.
- *
- * `node_draw_panels` asks for `ICON_RIGHTARROW` when the panel is collapsed
- * and `ICON_DOWNARROW_HLT` when it is open, at `but_size = U.widget_unit *
- * 0.8` = {@link NODE_HEADER_ICON_SIZE} (`node_draw.cc:2035-2046`). Both marks
- * are single stroked chevrons, and these numbers are read straight off their
- * own path data in the checkout:
- *
- * - `release/datafiles/icons_svg/rightarrow.svg` —
- *   `l3.64649 3.64648 -3.64649 3.64648` with a `.50005` round cap, under
- *   `matrix(100 0 0 100 -40899.645 -60100.058)`: a chevron reaching **4**
- *   units along its axis and **±3.646** across, stroked **1** unit wide, on
- *   Blender's **8**-unit small-icon cell.
- * - `downarrow_hlt.svg` — `l4 4 4 -4`, the same chevron turned a quarter.
- *
- * DELIBERATELY NOT ADDED TO `blender.icons.traced.json`, and the reason is a
- * measured defect in that trace rather than a preference:
- * `traceBlenderIcon`'s one scaling rule is `16 / viewBox.width`, which is
- * right only for the 1600-wide artboards that carry a `matrix(100 …)`.
- * These two files are 700x1100 and 1100x700, and **13 glyphs already in that
- * set** come from non-1600 artboards and are scaled wrong —
- * `blender-mod-particle-instance` traces to a box at **[273, -60]**, off the
- * 16-unit grid entirely, and `rightarrow` would have traced to a 10.8x20.3
- * mark. Correcting that trace moves twelve shipped marks and belongs to
- * whoever owns the icon set; stating it here, with the numbers, is this
- * unit's honest half.
- */
+/** Panel toggles draw the source rightarrow and downarrow_hlt chevrons in Blender’s 8-unit small-icon cell, scaled to NODE_HEADER_ICON_SIZE. */
 export const PANEL_TRIANGLE = {
   /** Blender's small-icon cell — the space the numbers below are on. */
   cell: 8,
@@ -686,21 +533,17 @@ export const PANEL_TRIANGLE = {
 export const PANEL_SUB_BACK = '#000000';
 export const PANEL_SUB_BACK_ALPHA = (0x1f / 255) * 1.5;
 
-/**
- * One item of a TRACED declaration — a row of `blender.node-panels.json`,
- * which is `blender-node-panels.source.mjs`'s reading of the node's C++
- * `declare()` body. The five kinds are `flat_item::Type`'s five
- * (`node_draw.cc:798-831`).
- */
+interface NodeSocketDecl {
+  readonly name: string;
+  readonly identifier?: string;
+  readonly panelToggle?: boolean;
+  readonly alignWithPrevious?: boolean;
+}
+
+/** One item of the traced C++ declaration in blender.node-panels.json: inputs, outputs, panels, layouts and separators expand into the flat layout items. */
 export type NodeDeclItem =
-  | {
-      readonly kind: 'input' | 'output';
-      readonly name: string;
-      readonly identifier?: string;
-      readonly panelToggle?: boolean;
-      readonly conditional?: boolean;
-      readonly alignWithPrevious?: boolean;
-    }
+  | ({ readonly kind: 'input' } & NodeSocketDecl)
+  | ({ readonly kind: 'output' } & NodeSocketDecl)
   | {
       readonly kind: 'panel';
       readonly name: string;
@@ -712,7 +555,6 @@ export type NodeDeclItem =
 
 export interface NodeDeclaration {
   readonly customSocketOrder: boolean;
-  readonly conditional?: boolean;
   readonly items: readonly NodeDeclItem[];
 }
 
@@ -722,23 +564,7 @@ export interface NodeDeclaration {
 const declIdentifier = (item: { readonly name: string; readonly identifier?: string }): string =>
   item.identifier ?? item.name;
 
-/**
- * DOES THE TRACED DECLARATION DESCRIBE THIS LIVE NODE?
- *
- * The ruling's own condition — "when the live socket list disagrees with the
- * traced declaration the view draws flat with the frame warning it draws
- * today". The check is STRICT and ordered: every socket the declaration
- * names, in declaration order, against `node.inputs`/`node.outputs` by
- * IDENTIFIER.
- *
- * Strict is the right strength because an UNAVAILABLE socket is still in the
- * live list: `.available(false)` sets `SOCK_UNAVAIL`, which RNA reports as
- * `enabled == False`, not as an absent socket. So a declaration that matches
- * the engine matches it exactly, and anything less is the engine having moved
- * out from under the trace — a different Blender, a `declare()` that took the
- * other arm of an `if`, a node group whose panels are runtime data. Each of
- * those must fall back, and be SEEN to.
- */
+/** Match each traced socket identifier against the live inputs and outputs in order. Unavailable sockets remain in the live list. A mismatch or runtime group declaration uses the named flat-layout fallback. */
 export function declarationAgrees(
   declaration: NodeDeclaration,
   inputs: readonly { readonly identifier: string }[],
@@ -747,7 +573,7 @@ export function declarationAgrees(
   if (!declaration.customSocketOrder) {
     return {
       ok: false,
-      why: 'its declaration does not set use_custom_socket_order, so Blender lays it out the legacy way',
+      why: 'its declaration does not set use_custom_socket_order, so Blender uses the default socket order',
     };
   }
   const declaredIn: string[] = [];
@@ -769,8 +595,8 @@ export function declarationAgrees(
       return `the declaration names ${declared.length} ${side}${declared.length === 1 ? '' : 's'} and the engine reports ${live.length}`;
     }
     for (let index = 0; index < declared.length; index++) {
-      if (declared[index] !== live[index]?.identifier) {
-        return `${side} ${index} is "${live[index]?.identifier}" in the engine and "${declared[index]}" in the declaration`;
+      if (declared[index] !== live[index]!.identifier) {
+        return `${side} ${index} is "${live[index]!.identifier}" in the engine and "${declared[index]}" in the declaration`;
       }
     }
     return null;
@@ -850,12 +676,10 @@ const MARGIN_BETWEEN: Partial<Record<FlatType, Partial<Record<FlatType, number>>
   PanelContentEnd: { Socket: 1, Separator: 1, Layout: 1, PanelHeader: 3, PanelContentEnd: 0 },
 };
 
-interface FlatItem {
-  readonly type: FlatType;
-  readonly input?: LayoutSocketInput | undefined;
-  readonly output?: LayoutSocketInput | undefined;
-  readonly panel?: PanelState | undefined;
-}
+type FlatItem =
+  | { readonly type: 'Socket'; readonly input?: LayoutSocketInput | undefined; readonly output?: LayoutSocketInput | undefined }
+  | { readonly type: 'Layout' | 'Separator' }
+  | { readonly type: 'PanelHeader' | 'PanelContentBegin' | 'PanelContentEnd'; readonly panel: PanelState };
 
 interface PanelState {
   readonly name: string;
@@ -900,14 +724,13 @@ function flatten(
       }
       // `add_flat_items_for_socket`: an ALIGNED socket joins the previous
       // item's row instead of opening one (`node_draw.cc:703-717`).
-      const last = out[out.length - 1];
-      if (item.alignWithPrevious === true && previousVisible && last && last.type === 'Socket') {
+      if (item.alignWithPrevious === true && previousVisible) {
+        const last = out[out.length - 1] as Extract<FlatItem, { type: 'Socket' }>;
         out[out.length - 1] = {
           type: 'Socket',
           input: item.kind === 'input' ? socket : last.input,
           output: item.kind === 'output' ? socket : last.output,
         };
-        previousVisible = true;
         continue;
       }
       out.push({
@@ -929,12 +752,6 @@ function flatten(
       if (showOptions) out.push({ type: 'Layout' });
       continue;
     }
-    // A DISCRIMINANT THAT IS ITSELF A UNION (`kind: 'input' | 'output'`) does
-    // not narrow away in the NEGATIVE branch of `a === 'input' || a ===
-    // 'output'`, so without this guard `item` still carries that member here
-    // and `item.items` does not typecheck. It is a compiler fact, not a real
-    // branch.
-    if (item.kind !== 'panel') continue;
     // A PANEL. `panel_input_decl()` (`node_declaration.cc:528-542`): the
     // panel's FIRST item, when it is a `panel_toggle` boolean input, is drawn
     // in the header and takes no row of its own.
@@ -1015,8 +832,8 @@ export interface LaidOutPanelledNode extends LaidOutNode {
  * with.
  */
 export function layoutNodeWithPanels(node: PanelLayoutInput): LaidOutPanelledNode {
-  const x = node.location[0] ?? 0;
-  const top = node.location[1] ?? 0;
+  const x = node.location[0];
+  const top = node.location[1];
   const width = node.width;
   const sockets = new Map<string, LayoutSocketInput>();
   for (const socket of node.inputs) sockets.set(`input:${socket.identifier}`, socket);
@@ -1043,13 +860,12 @@ export function layoutNodeWithPanels(node: PanelLayoutInput): LaidOutPanelledNod
     dy -= NODE_DYS; // `get_margin_empty()` — node_draw.cc:833-836
   }
   for (let index = 0; index < items.length; index++) {
-    const item = items[index];
-    if (!item) continue;
+    const item = items[index]!;
     const previous = items[index - 1];
     const margin =
       index === 0
         ? (MARGIN_FROM_TOP[item.type] ?? 0)
-        : (MARGIN_BETWEEN[previous?.type ?? 'Socket']?.[item.type] ?? 0);
+        : (MARGIN_BETWEEN[previous!.type]?.[item.type] ?? 0);
     dy -= margin * NODE_ITEM_SPACING_Y;
 
     if (item.type === 'Socket') {
@@ -1066,7 +882,7 @@ export function layoutNodeWithPanels(node: PanelLayoutInput): LaidOutPanelledNod
       dy -= NODE_DY;
       continue;
     }
-    if (item.type === 'PanelHeader' && item.panel) {
+    if (item.type === 'PanelHeader') {
       dy -= PANEL_HEADER_HEIGHT / 2;
       item.panel.centerY = dy;
       dy -= PANEL_HEADER_HEIGHT / 2;
@@ -1075,8 +891,8 @@ export function layoutNodeWithPanels(node: PanelLayoutInput): LaidOutPanelledNod
       }
       continue;
     }
-    if (item.type === 'PanelContentBegin' && item.panel) item.panel.contentTop = dy;
-    if (item.type === 'PanelContentEnd' && item.panel) item.panel.contentBottom = dy;
+    if (item.type === 'PanelContentBegin') item.panel.contentTop = dy;
+    if (item.type === 'PanelContentEnd') item.panel.contentBottom = dy;
   }
 
   const last = items[items.length - 1];
@@ -1097,16 +913,14 @@ export function layoutNodeWithPanels(node: PanelLayoutInput): LaidOutPanelledNod
     }
   }
 
-  // `tag_final_panel` (`node_draw.cc:1063-1082`): walking back from the end,
-  // the innermost panel whose content runs to the node's very bottom.
+  // `tag_final_panel` (`node_draw.cc:1063-1082`): mark each closing panel at the node's bottom.
   for (let index = items.length - 1; index >= 0; index--) {
-    const item = items[index];
-    if (!item || item.type !== 'PanelContentEnd') break;
-    if (item.panel) item.panel.fillsNodeEnd = true;
+    const item = items[index]!;
+    if (item.type !== 'PanelContentEnd') break;
+    item.panel.fillsNodeEnd = true;
   }
 
   return {
-    name: node.name,
     x,
     yTop: top,
     yBottom: Math.min(dy, top - 2 * NODE_DY),