@yuneta/gobj-ui 5.16.0 → 6.0.0

package/dist/gobj-ui.es.js

@@ -6467,6 +6467,7 @@ function build_form_field_conf(gobj, field_desc) {
 			field_conf.extras.pattern = "^-?\\d+(\\.\\d+)?$";
 			break;
 		case "rowid":
+		case "qualified":
 			field_conf.tag = "input";
 			field_conf.inputType = "text";
 			break;
@@ -6608,7 +6609,8 @@ function build_fkey_ref$1(gobj, field_desc, value) {
 /************************************************************
 *  Apply the form mode to the pkey field:
 *      "update" -> pkey readonly, not required
-*      "create" -> pkey writable and required (readonly if rowid)
+*      "create" -> pkey writable and required, unless the store
+*                  hands the key out itself (rowid, qualified)
 *  Empty form_mode keeps the template-declared behaviour
 *  (backward compatible).
 ************************************************************/
@@ -6621,8 +6623,8 @@ function apply_form_mode(gobj, $form) {
 		log_error(sprintf("%s: form_mode '%s' but form has no pkey field '%s'", gobj_short_name(gobj), mode, pkey));
 		return;
 	}
-	let is_rowid = $input.field_desc && $input.field_desc.type === "rowid";
-	if (mode === "create" && !is_rowid) {
+	let type = $input.field_desc ? $input.field_desc.type : "";
+	if (mode === "create" && !(type === "rowid" || type === "qualified")) {
 		$input.removeAttribute("readonly");
 		$input.setAttribute("required", "");
 	} else {
@@ -7400,6 +7402,7 @@ function template2columns(gobj, columns, template, sub_elements) {
 				};
 				break;
 			case "rowid":
+			case "qualified":
 				column = null;
 				break;
 			case "boolean":
@@ -7765,6 +7768,7 @@ function treedb_value_2_form_value(gobj, field_desc, value) {
 		case "enum":
 		case "uuid":
 		case "rowid":
+		case "qualified":
 		case "password":
 		case "email":
 		case "url": break;
@@ -7848,6 +7852,7 @@ function form_value_2_treedb_value(gobj, field_desc, value) {
 		case "enum":
 		case "uuid":
 		case "rowid":
+		case "qualified":
 		case "password":
 		case "email":
 		case "url": break;
@@ -16925,7 +16930,8 @@ function transform__treedb_value_2_table_value(gobj, col, value, row, field) {
 		case "email":
 		case "tel":
 		case "url":
-		case "rowid": break;
+		case "rowid":
+		case "qualified": break;
 		case "integer": break;
 		case "real": break;
 		case "boolean": break;
@@ -17388,6 +17394,7 @@ function transform__form_value_2_treedb_value(gobj, col, value, operation) {
 	const field_desc = treedb_get_field_desc(col);
 	switch (field_desc.type) {
 		case "rowid":
+		case "qualified":
 			if (operation === "create") value = "";
 			break;
 		case "string":
@@ -19754,11 +19761,26 @@ function register_c_yui_treedb_graph() {
 /***********************************************************************
 *          c_yui_treedb_schema.js
 *
-*      Schema-graph landing (prototype): the treedb drawn as a GRAPH OF
-*      TOPICS — one node per topic, one edge per hook/fkey relationship
-*      — from the schema `descs` alone (no data, no backend calls). A
-*      node click opens that topic's table (a real hash navigation via
-*      the host-supplied `node_route`). An alternate landing to the
+*      Schema-graph landing: the treedb drawn the way its `.c` literal
+*      draws it in ASCII (treedb_schema_*.c, treedb_system_schema.c) —
+*      one CARD per topic listing its fields in schema order, one edge
+*      per hook, from the row that declares the hook to the fkey row of
+*      the child it names. Built from the schema `descs` alone: no data,
+*      no backend calls.
+*
+*      WHY THE CARD AND NOT A DOT. A topic is its fields; a schema is
+*      read to find out what a topic holds and what links to what. A
+*      graph of labelled dots answers neither, and the node graph next
+*      door (C_G6_NODES_TREE) answers a different question entirely —
+*      it draws the RECORDS, so on a treedb whose records are schemas
+*      it draws one box per column, hundreds of them, each labelled by
+*      a pkey that may be a rowid. This view draws the schema itself.
+*
+*      The marks are the notation of the `.c` literals, so the drawing
+*      and the source read the same — see schema_rows().
+*
+*      A node click opens that topic's table (a real hash navigation
+*      via the host-supplied `node_route`). An alternate landing to the
 *      topic cards, in the spirit of "every treedb is a graph".
 *
 *          Copyright (c) 2026, ArtGins.
@@ -19768,6 +19790,27 @@ function register_c_yui_treedb_graph() {
 *              Constants
 ***************************************************************/
 var GCLASS_NAME$2 = "C_YUI_TREEDB_SCHEMA";
+/************************************************************
+*   Geometry of a card, in one place: the row height is what
+*   turns a field's index into the vertical position of its
+*   port, so an edge leaves the very row that declares the
+*   hook and lands on the row that declares the fkey.
+************************************************************/
+var CARD_HEADER_H = 30;
+var CARD_ROW_H = 19;
+var CARD_PAD_V = 7;
+var CARD_MIN_W = 210;
+var CARD_MAX_W = 340;
+var topic_colors = [
+	"rgb(237, 201, 73)",
+	"rgb(118, 183, 178)",
+	"rgb(255, 157, 167)",
+	"rgb(175, 122, 161)",
+	"rgb(89, 161, 79)",
+	"rgb(186, 176, 171)",
+	"rgb(66, 146, 198)"
+];
+var SYSTEM_TOPIC_COLOR = "rgb(148, 163, 184)";
 /***************************************************************
 *              Data
 ***************************************************************/
@@ -19829,48 +19872,254 @@ function build_ui$2(gobj) {
 	gobj_write_attr(gobj, "$container", $container);
 }
 /************************************************************
+*   The shape of a hook/fkey field, from the type it declares.
+*   `dict` and `object` are the SAME thing to treedb (both build
+*   a json object keyed by child id), and so are `list` and
+*   `array` — see the hook/fkey switches in tr_treedb.c. A
+*   `string` holds one reference, so it draws as one.
+************************************************************/
+function hook_mark(type) {
+	if (type === "dict" || type === "object") return "{}";
+	if (type === "list" || type === "array") return "[]";
+	return "()";
+}
+/************************************************************
+*   The fields of one topic, as the schema declares them.
+*
+*   The marks are the notation of the schema `.c` literals
+*   (treedb_schema_*.c, treedb_system_schema.c), so the
+*   drawing and the source read the same:
+*      {}   dict hook   (N unique children)
+*      []   list hook   (n not-unique children)
+*      ()   1 child
+*      (↖)  1 fkey      (1 parent)
+*      [↖]  n fkeys     (n parents)
+*      {↖}  N fkeys     (N parents)
+*      *    required
+*      #    the primary key
+*
+*   A column can be BOTH hook and fkey, so the flags are read
+*   here rather than through treedb_get_field_desc's single
+*   `type`, which keeps only the last flag it saw.
+************************************************************/
+function schema_rows(desc) {
+	let rows = [];
+	if (!is_object(desc) || !Array.isArray(desc.cols)) return rows;
+	for (let col of desc.cols) {
+		if (!is_object(col) || !col.id) continue;
+		let flags = Array.isArray(col.flag) ? col.flag : [];
+		let is_hook = flags.indexOf("hook") >= 0;
+		let is_fkey = flags.indexOf("fkey") >= 0;
+		let mark = "";
+		if (is_hook) mark = hook_mark(col.type);
+		if (is_fkey) {
+			let fmark = hook_mark(col.type).replace("}", "↖}").replace("]", "↖]").replace(")", "↖)");
+			mark = mark ? mark + " " + fmark : fmark;
+		}
+		rows.push({
+			name: col.id,
+			type: col.type || "",
+			mark,
+			is_hook,
+			is_fkey,
+			is_pkey: col.id === desc.pkey,
+			required: flags.indexOf("required") >= 0 || flags.indexOf("notnull") >= 0
+		});
+	}
+	return rows;
+}
+/************************************************************
+*   Size of the card that holds those rows. The width follows
+*   the longest line so a long field name is not clipped into
+*   an ellipsis — the point of the drawing is to read them.
+************************************************************/
+function card_size(rows) {
+	let longest = 0;
+	for (let row of rows) {
+		let len = row.name.length + (row.mark ? row.mark.length + 2 : 0) + 2;
+		if (len > longest) longest = len;
+	}
+	let w = Math.round(26 + longest * 6.6);
+	if (w < CARD_MIN_W) w = CARD_MIN_W;
+	if (w > CARD_MAX_W) w = CARD_MAX_W;
+	let h = 44 + rows.length * CARD_ROW_H;
+	return [w, h];
+}
+/************************************************************
+*   Vertical placement of a field's port, as a fraction of the
+*   card height: the centre of its own row.
+************************************************************/
+function row_placement(index, height) {
+	return (37 + index * CARD_ROW_H + CARD_ROW_H / 2) / height;
+}
+/************************************************************
+*   The card itself. Header = topic name on its topic colour;
+*   body = one line per field, in schema order.
+************************************************************/
+function build_card_innerHTML(topic, rows, color, dark) {
+	let surface = dark ? "#1b2230" : "#ffffff";
+	let bg = dark ? `color-mix(in srgb, ${color} 18%, #232b38)` : `color-mix(in srgb, ${color} 6%, ${surface})`;
+	let border = dark ? `color-mix(in srgb, ${color} 85%, #ffffff)` : color;
+	let header_bg = dark ? `color-mix(in srgb, ${color} 45%, #2c3542)` : `color-mix(in srgb, ${color} 28%, ${surface})`;
+	let title_color = dark ? "#e8eaed" : "#0f172a";
+	let text_color = dark ? "#d3d8de" : "#334155";
+	let mute_color = dark ? "#98a2b0" : "#7c8694";
+	let rule_color = dark ? "rgba(255,255,255,0.06)" : "rgba(15,23,42,0.05)";
+	let shadow = dark ? "0 1px 3px rgba(0,0,0,0.45), 0 1px 2px rgba(0,0,0,0.30)" : "0 1px 3px rgba(15,23,42,0.12), 0 1px 2px rgba(15,23,42,0.06)";
+	let rows_html = "";
+	for (let row of rows) {
+		let lead = row.is_pkey ? "#" : row.required ? "*" : "";
+		let name_weight = row.is_pkey || row.required ? "600" : "400";
+		let name_color = row.is_hook || row.is_fkey ? title_color : text_color;
+		rows_html += `    <div class="TREEDB_SCHEMA_FIELD" style="
+        display: flex; align-items: center; gap: 6px;
+        height: ${CARD_ROW_H}px; line-height: ${CARD_ROW_H}px;
+        padding: 0 10px; border-top: 1px solid ${rule_color};
+    ">
+        <span style="
+            width: 8px; flex: 0 0 8px; text-align: center;
+            color: ${mute_color}; font-size: 11px;
+        ">${lead}</span>
+        <span style="
+            flex: 1 1 auto; min-width: 0; overflow: hidden;
+            text-overflow: ellipsis; white-space: nowrap;
+            font-size: 12px; font-weight: ${name_weight}; color: ${name_color};
+        ">${escapeHtml(row.name)}</span>
+        <span style="
+            flex: 0 0 auto; font-size: 11px; color: ${mute_color};
+            font-family: ui-monospace, SFMono-Regular, Menlo, monospace;
+        ">${escapeHtml(row.mark)}</span>
+    </div>
+`;
+	}
+	return `
+<div class="TREEDB_SCHEMA_CARD" title="${escapeHtml(topic)}" style="
+    box-sizing: border-box;
+    width: 100%;
+    height: 100%;
+    background: ${bg};
+    border: 1.5px solid ${border};
+    border-radius: 8px;
+    box-shadow: ${shadow};
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    cursor: pointer;
+">
+    <div class="TREEDB_SCHEMA_CARD_HEADER" style="
+        height: ${CARD_HEADER_H}px; line-height: ${CARD_HEADER_H}px;
+        flex: 0 0 ${CARD_HEADER_H}px;
+        padding: 0 10px; background: ${header_bg}; color: ${title_color};
+        font-size: 13px; font-weight: 700;
+        overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
+    ">${escapeHtml(topic)}</div>
+    <div class="TREEDB_SCHEMA_CARD_BODY" style="
+        flex: 1 1 auto; padding: ${CARD_PAD_V}px 0; overflow: hidden;
+    ">
+${rows_html}    </div>
+</div>
+`;
+}
+/************************************************************
 *   Derive {nodes, edges} from the schema.
-*   Node  = a topic.  Edge  = a hook (parent -> child) or an
-*   fkey (child -> parent, reversed to parent -> child), deduped.
+*
+*   Node = a topic, drawn as the card the `.c` literal draws in
+*   ASCII: its name and its fields. Edge = a hook, from the row
+*   that declares it to the fkey row of the child it names —
+*   `'hook': {'users': 'departments'}` says both ends, so the
+*   arrow can land where the `.c` drawing lands it. An fkey
+*   whose parent declares no hook still gets its edge, or a
+*   half-declared schema would draw as disconnected.
+*
 *   Left-to-right dagre follows the parent -> child data flow.
 ************************************************************/
 function schema_to_graph(gobj) {
 	let descs = gobj_read_attr(gobj, "descs");
 	let system = gobj_read_bool_attr(gobj, "system");
+	let dark = yui_is_dark();
 	let nodes = [];
-	let topic_set = {};
+	let cards = {};
 	if (!is_object(descs)) return {
 		nodes,
 		edges: []
 	};
+	let idx = 0;
 	for (let topic of Object.keys(descs)) {
-		if (!system && topic.substring(0, 2) === "__") continue;
-		topic_set[topic] = true;
+		let is_system = topic.substring(0, 2) === "__";
+		if (!system && is_system) continue;
+		let rows = schema_rows(descs[topic]);
+		let color;
+		if (is_system) color = SYSTEM_TOPIC_COLOR;
+		else {
+			color = topic_colors[idx % topic_colors.length];
+			idx++;
+		}
+		cards[topic] = {
+			rows,
+			size: card_size(rows),
+			color
+		};
+	}
+	for (let topic of Object.keys(cards)) {
+		let card = cards[topic];
+		let [w, h] = card.size;
+		let ports = [];
+		for (let i = 0; i < card.rows.length; i++) {
+			let row = card.rows[i];
+			if (!row.is_hook && !row.is_fkey) continue;
+			ports.push({
+				key: row.name,
+				placement: [row.is_hook ? 1 : 0, row_placement(i, h)],
+				fill: card.color,
+				stroke: getStrokeColor(card.color)
+			});
+		}
 		nodes.push({
 			id: topic,
-			data: { topic_name: topic }
+			type: "html",
+			style: {
+				size: [w, h],
+				dx: -w / 2,
+				dy: -h / 2,
+				innerHTML: build_card_innerHTML(topic, card.rows, card.color, dark),
+				port: ports.length > 0,
+				ports,
+				portR: 3,
+				portLineWidth: 1
+			},
+			data: {
+				topic_name: topic,
+				rows: card.rows,
+				color: card.color
+			}
 		});
 	}
 	let edge_seen = {};
 	let edges = [];
-	let add_edge = (source, target) => {
-		if (!topic_set[source] || !topic_set[target] || source === target) return;
-		let key = source + "
" + target;
+	let add_edge = (source, source_port, target, target_port) => {
+		if (!cards[source] || !cards[target]) return;
+		let key = `${source}|${source_port}|${target}|${target_port}`;
 		if (edge_seen[key]) return;
 		edge_seen[key] = true;
 		edges.push({
 			id: key,
+			type: "cubic",
 			source,
-			target
+			target,
+			style: {
+				sourcePort: source_port,
+				targetPort: target_port
+			}
 		});
 	};
-	for (let topic of Object.keys(descs)) {
+	for (let topic of Object.keys(cards)) {
 		let desc = descs[topic];
 		if (!is_object(desc) || !Array.isArray(desc.cols)) continue;
 		for (let col of desc.cols) {
-			if (!col) continue;
-			if (is_object(col.hook)) for (let child of Object.keys(col.hook)) add_edge(topic, child);
-			else if (is_object(col.fkey)) for (let parent of Object.keys(col.fkey)) add_edge(parent, topic);
+			if (!is_object(col) || !col.id) continue;
+			if (is_object(col.hook)) for (let child of Object.keys(col.hook)) add_edge(topic, col.id, child, col.hook[child]);
+			if (is_object(col.fkey)) for (let parent of Object.keys(col.fkey)) add_edge(parent, col.fkey[parent], topic, col.id);
 		}
 	}
 	return {
@@ -19879,26 +20128,15 @@ function schema_to_graph(gobj) {
 	};
 }
 /************************************************************
-*   The theme-dependent styles, in ONE place: they are applied
-*   as the graph is built and re-applied on a theme switch
+*   The theme-dependent edge style, in ONE place: applied as
+*   the graph is built and re-applied on a theme switch
 *   (ac_theme), which restyles the LIVE graph — rebuilding it
 *   would drop the user's zoom/pan and any dragged node.
 ************************************************************/
-function node_style(dark) {
-	return {
-		size: 40,
-		fill: "#5B8FF9",
-		labelText: (d) => d.id,
-		labelPlacement: "bottom",
-		labelFill: dark ? "#e6e6e6" : "#333333",
-		labelBackground: true,
-		labelBackgroundFill: dark ? "rgba(0,0,0,0.5)" : "rgba(255,255,255,0.7)",
-		cursor: "pointer"
-	};
-}
 function edge_style(dark) {
 	return {
-		stroke: dark ? "#666666" : "#bbbbbb",
+		stroke: dark ? "#7a8593" : "#9aa4b2",
+		lineWidth: 1.2,
 		endArrow: true
 	};
 }
@@ -19930,13 +20168,12 @@ function build_graph$1(gobj) {
 			container: $container,
 			autoResize: true,
 			data,
-			node: { style: node_style(dark) },
 			edge: { style: edge_style(dark) },
 			layout: {
 				type: "antv-dagre",
 				rankdir: "LR",
-				nodesep: 24,
-				ranksep: 60
+				nodesep: 28,
+				ranksep: 90
 			},
 			behaviors: [
 				"zoom-canvas",
@@ -20021,8 +20258,17 @@ function ac_theme$1(gobj, event, kw, src) {
 	let dark = kw && kw.theme ? kw.theme === "dark" : yui_is_dark();
 	try {
 		graph.setTheme(dark ? "dark" : "light");
-		graph.setNode({ style: node_style(dark) });
 		graph.setEdge({ style: edge_style(dark) });
+		let updates = [];
+		for (let node of graph.getNodeData()) {
+			let data = node.data;
+			if (!is_object(data) || !Array.isArray(data.rows)) continue;
+			updates.push({
+				id: node.id,
+				style: { innerHTML: build_card_innerHTML(data.topic_name, data.rows, data.color, dark) }
+			});
+		}
+		if (updates.length > 0) graph.updateNodeData(updates);
 		graph.draw().catch((e) => {
 			log_error(`${gobj_short_name(gobj)}: schema graph redraw failed: ${e}`);
 		});
@@ -20087,6 +20333,61 @@ function register_c_yui_treedb_schema() {
 	return create_gclass$2(GCLASS_NAME$2);
 }
 //#endregion
+//#region src/treedb_node_label.js
+/***********************************************************************
+*          treedb_node_label.js
+*
+*      Pure, testable logic behind the label of a node in the treedb
+*      graph: WHAT A RECORD IS CALLED, which is not always what it is
+*      keyed by. Kept out of the gclass so it can be unit-tested with
+*      no DOM and no G6.
+*
+*          Copyright (c) 2026, ArtGins.
+*          All Rights Reserved.
+***********************************************************************/
+/************************************************************
+*  What a node is CALLED, which is not always what it is
+*  keyed by.
+*
+*  A topic whose id column is flagged `rowid`, `uuid` or
+*  `qualified` keys its records by something that is not the
+*  name — a counter, a random string, or the name with every
+*  ancestor in front of it — and the name a human knows the
+*  record by lives in the secondary key the topic declares
+*  (`pkey2s`, carried in the desc since SDK > 7.13.0). The
+*  `topics` and `cols` topics of treedb_system_schema are the
+*  case that forced this: named in `value`, so every card in
+*  the graph read "181", "225", "193" while they were keyed by
+*  rowid, and reads the whole path now that they are
+*  qualified.
+*
+*  The pkey stays reachable: it is the card's tooltip.
+*
+*  Falls back to the id whenever the schema does not say
+*  otherwise — an older node whose desc carries no `pkey2s`
+*  included.
+************************************************************/
+function node_label(desc, record) {
+	let id = record.id;
+	let id_col = null;
+	if (Array.isArray(desc.cols)) {
+		for (let col of desc.cols) if (col && col.id === (desc.pkey || "id")) {
+			id_col = col;
+			break;
+		}
+	}
+	if (!id_col || !Array.isArray(id_col.flag)) return id;
+	if (id_col.flag.indexOf("rowid") < 0 && id_col.flag.indexOf("uuid") < 0 && id_col.flag.indexOf("qualified") < 0) return id;
+	let pkey2s = desc.pkey2s;
+	if (typeof pkey2s === "string") pkey2s = pkey2s ? [pkey2s] : [];
+	if (!Array.isArray(pkey2s)) return id;
+	for (let name of pkey2s) {
+		let value = record[name];
+		if (typeof value === "string" && value.length > 0) return value;
+	}
+	return id;
+}
+//#endregion
 //#region node_modules/@babel/runtime/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
@@ -47619,19 +47920,19 @@ function create_topic_node(gobj, desc, record) {
 		style.size = [116, 40];
 		style.dx = -58;
 		style.dy = -20;
-		style.innerHTML = build_chip_innerHTML(desc.color, priv.theme, record.icon, record.id);
+		style.innerHTML = build_chip_innerHTML(desc.color, priv.theme, record.icon, node_label(desc, record), record.id);
 	} else if (node_treedb_type === "extended") {
 		node_graph_type = "html";
 		style.size = [144, 66];
 		style.dx = -72;
 		style.dy = -33;
-		style.innerHTML = build_node_innerHTML(desc.color, priv.theme, record.icon, record.id, desc.topic_name, true);
+		style.innerHTML = build_node_innerHTML(desc.color, priv.theme, record.icon, node_label(desc, record), desc.topic_name, true, record.id);
 	} else {
 		node_graph_type = "html";
 		style.size = [172, 96];
 		style.dx = -86;
 		style.dy = -48;
-		style.innerHTML = build_node_innerHTML(desc.color, priv.theme, record.icon, record.id, desc.topic_name);
+		style.innerHTML = build_node_innerHTML(desc.color, priv.theme, record.icon, node_label(desc, record), desc.topic_name, false, record.id);
 	}
 	let topic_props = priv._graph_properties[desc.topic_name];
 	let topic_defaults = is_object(topic_props) && is_object(topic_props.defaults) ? topic_props.defaults : null;
@@ -47699,15 +48000,15 @@ function update_topic_node(gobj, desc, node_name, record) {
 		nodedata.data.record = record;
 		if (desc.node_treedb_type === "child") graph.updateNodeData([{
 			id: node_name,
-			style: { innerHTML: build_chip_innerHTML(desc.color, priv.theme, record.icon, record.id) }
+			style: { innerHTML: build_chip_innerHTML(desc.color, priv.theme, record.icon, node_label(desc, record), record.id) }
 		}]);
 		else if (desc.node_treedb_type === "extended") graph.updateNodeData([{
 			id: node_name,
-			style: { innerHTML: build_node_innerHTML(desc.color, priv.theme, record.icon, record.id, desc.topic_name, true) }
+			style: { innerHTML: build_node_innerHTML(desc.color, priv.theme, record.icon, node_label(desc, record), desc.topic_name, true, record.id) }
 		}]);
 		else if (desc.node_treedb_type === "hierarchical") graph.updateNodeData([{
 			id: node_name,
-			style: { innerHTML: build_node_innerHTML(desc.color, priv.theme, record.icon, record.id, desc.topic_name) }
+			style: { innerHTML: build_node_innerHTML(desc.color, priv.theme, record.icon, node_label(desc, record), desc.topic_name, false, record.id) }
 		}]);
 	} catch (e) {
 		log_error(e.message);
@@ -49614,7 +49915,7 @@ function show_node_popover(gobj) {
 		};
 		if (node_graph_type === "hierarchical") {
 			let record = nodeData.data.record || {};
-			updateStyle.innerHTML = build_node_innerHTML(fill, priv.theme, record.icon, record.id, nodeData.data.desc.topic_name);
+			updateStyle.innerHTML = build_node_innerHTML(fill, priv.theme, record.icon, node_label(nodeData.data.desc, record), nodeData.data.desc.topic_name, false, record.id);
 		}
 		graph.updateNodeData([{
 			id: node_id,
@@ -49654,7 +49955,7 @@ function show_node_popover(gobj) {
 			};
 			if (node_graph_type === "hierarchical") {
 				let record = nodeData.data.record || {};
-				restoreStyle.innerHTML = build_node_innerHTML(origFill, priv.theme, record.icon, record.id, nodeData.data.desc.topic_name);
+				restoreStyle.innerHTML = build_node_innerHTML(origFill, priv.theme, record.icon, node_label(nodeData.data.desc, record), nodeData.data.desc.topic_name, false, record.id);
 			}
 			graph.updateNodeData([{
 				id: node_id,
@@ -49755,15 +50056,15 @@ function refresh_html_nodes_theme(gobj, theme) {
 		let record = nd.data.record || {};
 		if (tt === "hierarchical") updates.push({
 			id: nodes[i].id,
-			style: { innerHTML: build_node_innerHTML(nd.data.desc.color, theme, record.icon, record.id, nd.data.desc.topic_name) }
+			style: { innerHTML: build_node_innerHTML(nd.data.desc.color, theme, record.icon, node_label(nd.data.desc, record), nd.data.desc.topic_name, false, record.id) }
 		});
 		else if (tt === "child") updates.push({
 			id: nodes[i].id,
-			style: { innerHTML: build_chip_innerHTML(nd.data.desc.color, theme, record.icon, record.id) }
+			style: { innerHTML: build_chip_innerHTML(nd.data.desc.color, theme, record.icon, node_label(nd.data.desc, record), record.id) }
 		});
 		else if (tt === "extended") updates.push({
 			id: nodes[i].id,
-			style: { innerHTML: build_node_innerHTML(nd.data.desc.color, theme, record.icon, record.id, nd.data.desc.topic_name, true) }
+			style: { innerHTML: build_node_innerHTML(nd.data.desc.color, theme, record.icon, node_label(nd.data.desc, record), nd.data.desc.topic_name, true, record.id) }
 		});
 	}
 	if (updates.length > 0) graph.updateNodeData(updates);
@@ -49795,7 +50096,8 @@ function refresh_default_edges_theme(gobj, theme) {
 *  but lighter (1px border, no shadow, single line). The name is
 *  always legible (ellipsis + native title tooltip on overflow).
 ************************************************************/
-function build_chip_innerHTML(color, theme, icon, id) {
+function build_chip_innerHTML(color, theme, icon, label, key) {
+	let title = key || label;
 	let dark = theme === "dark";
 	let bg = dark ? `color-mix(in srgb, ${color} 30%, #2c3542)` : `color-mix(in srgb, ${color} 10%, ${dark ? "#1b2230" : "#ffffff"})`;
 	let border = dark ? `color-mix(in srgb, ${color} 85%, #ffffff)` : color;
@@ -49806,7 +50108,7 @@ function build_chip_innerHTML(color, theme, icon, id) {
         margin-right: 6px; flex: 0 0 auto;
     "/>`;
 	return `
-<div title="${escapeHtml(id)}" style="
+<div title="${escapeHtml(title)}" style="
     box-sizing: border-box;
     width: 100%;
     height: 100%;
@@ -49823,7 +50125,7 @@ function build_chip_innerHTML(color, theme, icon, id) {
 ">${icon_html}<span style="
         font-size: 12px; font-weight: 600; line-height: 1;
         overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
-    ">${escapeHtml(id)}</span>
+    ">${escapeHtml(label)}</span>
 </div>
 `;
 }
@@ -49837,7 +50139,8 @@ function build_chip_innerHTML(color, theme, icon, id) {
 *  colour is kept (per-topic differentiation) but softened via
 *  color-mix instead of a harsh saturated fill. Theme-aware.
 ************************************************************/
-function build_node_innerHTML(color, theme, icon, id, topic_name, structural) {
+function build_node_innerHTML(color, theme, icon, label, topic_name, structural, key) {
+	let title = key || label;
 	let dark = theme === "dark";
 	let surface = dark ? "#1b2230" : "#ffffff";
 	let bg, border, border_style;
@@ -49867,7 +50170,7 @@ function build_node_innerHTML(color, theme, icon, id, topic_name, structural) {
         overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
     ">${escapeHtml(topic_name)}</div>`;
 	return `
-<div title="${escapeHtml(id)}" style="
+<div title="${escapeHtml(title)}" style="
     box-sizing: border-box;
     width: 100%;
     height: 100%;
@@ -49890,7 +50193,7 @@ function build_node_innerHTML(color, theme, icon, id, topic_name, structural) {
         max-width: 100%; overflow: hidden; text-overflow: ellipsis;
         display: -webkit-box; -webkit-line-clamp: 2;
         -webkit-box-orient: vertical; word-break: break-word;
-    ">${escapeHtml(id)}</div>${sub_html}
+    ">${escapeHtml(label)}</div>${sub_html}
 </div>
 `;
 }
@@ -50111,7 +50414,7 @@ function apply_node_properties(gobj, node_id, fill, stroke, lineWidth, scope) {
 		};
 		if (nd.data.desc.node_treedb_type === "hierarchical") {
 			let record = nd.data.record || {};
-			updateStyle.innerHTML = build_node_innerHTML(fill, priv.theme, record.icon, record.id, nd.data.desc.topic_name);
+			updateStyle.innerHTML = build_node_innerHTML(fill, priv.theme, record.icon, node_label(nd.data.desc, record), nd.data.desc.topic_name, false, record.id);
 		}
 		updates.push({
 			id: nodes[i].id,