@yuneta/gobj-ui 7.23.186 → 7.23.188

package/dist/gobj-ui.cjs.js

@@ -23714,7 +23714,7 @@ function build_ui$6(gobj) {
 							[[
 								"span",
 								{ class: "icon" },
-								[yui_toolbar_icon("yi-hexagon-nodes")]
+								[yui_toolbar_icon("yi-compass-drafting")]
 							], [
 								"span",
 								{ i18n: "schema" },
@@ -23725,6 +23725,29 @@ function build_ui$6(gobj) {
 								(0, _yuneta_gobj_js.gobj_send_event)(gobj, "EV_TOGGLE_LANDING_VIEW", {}, gobj);
 							} }
 						],
+						[
+							"button",
+							{
+								class: "button TREEDB_SCHEMA_JSON_BTN is-hidden",
+								title: (0, i18next.t)("schema json"),
+								"aria-label": (0, i18next.t)("schema json"),
+								"data-i18n-title": "schema json",
+								"data-i18n-aria-label": "schema json"
+							},
+							[[
+								"span",
+								{ class: "icon" },
+								[yui_toolbar_icon("yi-code")]
+							], [
+								"span",
+								{ i18n: "schema json" },
+								"schema json"
+							]],
+							{ click: (evt) => {
+								evt.stopPropagation();
+								(0, _yuneta_gobj_js.gobj_send_event)(gobj, "EV_OPEN_SCHEMA_JSON", {}, gobj);
+							} }
+						],
 						[
 							"div",
 							{
@@ -24168,6 +24191,7 @@ function show_topics_landing(gobj) {
 	let $info = $container.querySelector(".TREEDB_TOPIC_INFO");
 	let $back = $container.querySelector(".TREEDB_TOPICS_BACK");
 	let $toggle = $container.querySelector(".TREEDB_LANDING_TOGGLE");
+	let $schema_json = $container.querySelector(".TREEDB_SCHEMA_JSON_BTN");
 	if ($tabs) $tabs.classList.add("is-hidden");
 	if ($sub) $sub.classList.add("is-hidden");
 	if ($info) $info.classList.add("is-hidden");
@@ -24177,6 +24201,7 @@ function show_topics_landing(gobj) {
 		$toggle.classList.remove("is-hidden");
 		$toggle.classList.toggle("is-primary", schema_mode);
 	}
+	if ($schema_json) $schema_json.classList.toggle("is-hidden", !schema_mode);
 	if (schema_mode) {
 		if ($landing) $landing.classList.add("is-hidden");
 		if ($schema) $schema.classList.remove("is-hidden");
@@ -24246,9 +24271,11 @@ function show_topic_detail(gobj) {
 	let $info = $container.querySelector(".TREEDB_TOPIC_INFO");
 	let $back = $container.querySelector(".TREEDB_TOPICS_BACK");
 	let $toggle = $container.querySelector(".TREEDB_LANDING_TOGGLE");
+	let $schema_json = $container.querySelector(".TREEDB_SCHEMA_JSON_BTN");
 	if ($landing) $landing.classList.add("is-hidden");
 	if ($schema) $schema.classList.add("is-hidden");
 	if ($info) $info.classList.add("is-hidden");
+	if ($schema_json) $schema_json.classList.add("is-hidden");
 	if ($toggle) $toggle.classList.add("is-hidden");
 	if ($tabs) $tabs.classList.remove("is-hidden");
 	if ($sub) $sub.classList.remove("is-hidden");
@@ -24289,8 +24316,10 @@ function show_topic_info(gobj, topic) {
 	let $schema = $container.querySelector(".TREEDB_TOPICS_SCHEMA");
 	let $back = $container.querySelector(".TREEDB_TOPICS_BACK");
 	let $toggle = $container.querySelector(".TREEDB_LANDING_TOGGLE");
+	let $schema_json = $container.querySelector(".TREEDB_SCHEMA_JSON_BTN");
 	if ($landing) $landing.classList.add("is-hidden");
 	if ($schema) $schema.classList.add("is-hidden");
+	if ($schema_json) $schema_json.classList.add("is-hidden");
 	if ($toggle) $toggle.classList.add("is-hidden");
 	if ($tabs) $tabs.classList.add("is-hidden");
 	if ($sub) $sub.classList.add("is-hidden");
@@ -24565,7 +24594,7 @@ function register_sub_routes$1(gobj) {
 	if ((0, _yuneta_gobj_js.is_object)((0, _yuneta_gobj_js.gobj_read_attr)(gobj, "landing_routes"))) nodes.push({
 		route: base + "/schema",
 		label: "schema",
-		icon: "yi-hexagon-nodes",
+		icon: "yi-compass-drafting",
 		gclass: "C_YUI_TREEDB_SCHEMA"
 	});
 	if ((0, _yuneta_gobj_js.is_object)(descs)) for (let topic of Object.keys(descs)) {
@@ -24708,10 +24737,11 @@ function is_mobile$2() {
 *  whole service (lazy drill). CHILD model: the viewer publishes
 *  EV_EXPAND_PATH to us.
 ************************************************************/
-function open_json_viewer$1(gobj) {
+function open_json_viewer$1(gobj, opts) {
 	let priv = gobj.priv;
+	let schema = !!(opts && opts.schema);
 	if (priv.json_win || priv.json_modal) {
-		request_print_tranger$1(gobj, "");
+		if (!schema) request_print_tranger$1(gobj, "");
 		return;
 	}
 	if (!(0, _yuneta_gobj_js.gclass_find_by_name)("C_YUI_JSON")) {
@@ -24721,7 +24751,10 @@ function open_json_viewer$1(gobj) {
 	}
 	let mobile = is_mobile$2();
 	let shell = yui_shell_of(gobj);
-	let jv = (0, _yuneta_gobj_js.gobj_create_service)(`treedb-topics-json-${(0, _yuneta_gobj_js.clean_name)((0, _yuneta_gobj_js.gobj_name)(gobj))}`, "C_YUI_JSON", { subscriber: gobj }, gobj);
+	let jv = (0, _yuneta_gobj_js.gobj_create_service)(`treedb-topics-json-${(0, _yuneta_gobj_js.clean_name)((0, _yuneta_gobj_js.gobj_name)(gobj))}`, "C_YUI_JSON", {
+		subscriber: gobj,
+		json_data: schema ? (0, _yuneta_gobj_js.gobj_read_attr)(gobj, "descs") : null
+	}, gobj);
 	if (!jv) {
 		(0, _yuneta_gobj_js.log_error)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: cannot create the JSON viewer`);
 		return;
@@ -24739,7 +24772,7 @@ function open_json_viewer$1(gobj) {
 			dialog: true,
 			logical_class: "TREEDB_JSON_SHEET",
 			title_prefix: priv.treedb_name,
-			title: "raw json",
+			title: schema ? "schema json" : "raw json",
 			t: i18next.t,
 			on_close: () => {
 				if ((0, _yuneta_gobj_js.gobj_is_destroying)(gobj)) return;
@@ -24761,8 +24794,8 @@ function open_json_viewer$1(gobj) {
 			height: 620,
 			logical_class: "TREEDB_JSON_WINDOW",
 			title_prefix: priv.treedb_name,
-			title: "raw json",
-			icon: "yi-eye",
+			title: schema ? "schema json" : "raw json",
+			icon: schema ? "yi-code" : "yi-eye",
 			body: $box,
 			manager: null,
 			on_close: () => {
@@ -24777,7 +24810,7 @@ function open_json_viewer$1(gobj) {
 		}
 		(0, _yuneta_gobj_js.gobj_start)(priv.json_win);
 	}
-	request_print_tranger$1(gobj, "");
+	if (!schema) request_print_tranger$1(gobj, "");
 }
 /************************************************************
 *  Close the JSON viewer (user dismiss / teardown).
@@ -25371,6 +25404,19 @@ function ac_open_json$1(gobj, event, kw, src) {
 	return 0;
 }
 /********************************************
+*  The schema, as the json it is: the `descs` the schema graph is
+*  drawing. Same viewer and same host as the tranger's raw json --
+*  one at a time, so it closes whatever was open first.
+********************************************/
+function ac_open_schema_json(gobj, event, kw, src) {
+	if (!(0, _yuneta_gobj_js.is_object)((0, _yuneta_gobj_js.gobj_read_attr)(gobj, "descs"))) {
+		(0, _yuneta_gobj_js.log_error)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: schema json with no descs`);
+		return -1;
+	}
+	open_json_viewer$1(gobj, { schema: true });
+	return 0;
+}
+/********************************************
 *  Open the graph where the reader left it: its last visited
 *  route under the graph's base -- `<graph>/<topic>` when a topic
 *  was focused there -- or the bare base when the graph was never
@@ -25504,6 +25550,11 @@ function create_gclass$6(gclass_name) {
 			ac_open_json$1,
 			null
 		],
+		[
+			"EV_OPEN_SCHEMA_JSON",
+			ac_open_schema_json,
+			null
+		],
 		[
 			"EV_OPEN_GRAPH",
 			ac_open_graph,
@@ -25576,6 +25627,7 @@ function create_gclass$6(gclass_name) {
 		["EV_RECORD_WRITTEN", _yuneta_gobj_js.event_flag_t.EVF_OUTPUT_EVENT | _yuneta_gobj_js.event_flag_t.EVF_NO_WARN_SUBS],
 		["EV_REFRESH_TOPIC", 0],
 		["EV_OPEN_JSON", 0],
+		["EV_OPEN_SCHEMA_JSON", 0],
 		["EV_OPEN_GRAPH", 0],
 		["EV_EXPAND_PATH", 0],
 		["EV_JSON_CLOSED", 0],
@@ -30347,54 +30399,57 @@ function plan_graph_saves(live, saved) {
 *          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.
+*      graph: WHAT A RECORD IS CALLED. 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.
+var SEP = " · ";
+/************************************************************
+*  What a node is CALLED: **its id, and the secondary keys it
+*  carries**.
+*
+*  A record is one thing and an INSTANCE of it is another: the
+*  topic keys the record by `id` and the instance by the
+*  columns it declares in `pkey2s`. A card that shows one
+*  without the other is a card that cannot be identified --
+*  and it used to show one INSTEAD of the other, so the yunos
+*  of an agent read `7.23.0-1`, `7.23.0-1`, `7.23.0-1` (the
+*  release, which they share) and never said which yuno each
+*  one was, while a `configurations` card read `1`.
+*
+*  It came from the opposite case, and that one still works:
+*  the `topics` and `cols` of treedb_system_schema are keyed
+*  by a rowid, so the card said "181" and the name lived in
+*  the pkey2. Now it says both -- `181 · yuno_role` -- which
+*  is what the record is: that name, under that key.
+*
+*  Rules:
+*      - the id always opens the label;
+*      - every pkey2 the record carries follows it, in the
+*        order the topic declares them, separated by `·`;
+*      - a pkey2 whose value is empty, absent or equal to the
+*        id adds nothing;
+*      - a desc with no `pkey2s` (an older node's schema
+*        included) gives the bare id.
 ************************************************************/
 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;
+	let pkey2s = desc ? desc.pkey2s : null;
 	if (typeof pkey2s === "string") pkey2s = pkey2s ? [pkey2s] : [];
-	if (!Array.isArray(pkey2s)) return id;
+	if (!Array.isArray(pkey2s) || pkey2s.length === 0) return id;
+	let parts = [];
 	for (let name of pkey2s) {
+		if (!name) continue;
 		let value = record[name];
-		if (typeof value === "string" && value.length > 0) return value;
+		if (typeof value === "number") value = String(value);
+		if (typeof value !== "string" || value.length === 0) continue;
+		if (value === String(id)) continue;
+		parts.push(value);
 	}
-	return id;
+	if (parts.length === 0) return id;
+	return [id, ...parts].join(SEP);
 }
 //#endregion
 //#region src/treedb_fold_model.js
@@ -58820,7 +58875,7 @@ function build_graph$1(gobj) {
 		container: priv.$container,
 		animation: false,
 		autoResize: false,
-		zoomRange: [.2, 4],
+		zoomRange: [.02, 4],
 		node: {
 			palette: {
 				type: "group",
@@ -60076,6 +60131,7 @@ function draw_link(gobj, child_topic, child_id, source_col, fkey, verbose) {
 		parent_topic,
 		parent_id,
 		hook_name,
+		child_topic,
 		child_id,
 		is_tree
 	});
@@ -60582,7 +60638,7 @@ async function graph_fit_selection(gobj, ids) {
 	let bw = Math.max(1, maxx - minx);
 	let bh = Math.max(1, maxy - miny);
 	let zoom = Math.min(vw / bw, vh / bh);
-	let range = graph.getZoomRange() || [.2, 4];
+	let range = graph.getZoomRange() || [.02, 4];
 	zoom = Math.max(range[0], Math.min(range[1], zoom));
 	await graph.zoomTo(zoom);
 	await graph.focusElement(ids);
@@ -63319,16 +63375,14 @@ function refresh_html_nodes_theme(gobj, theme) {
 function refresh_default_edges_theme(gobj, theme) {
 	let graph = gobj.priv.graph;
 	if (!graph) return;
-	let dark = theme === "dark";
 	let edges = graph.getData().edges || [];
 	let updates = [];
 	for (let i = 0; i < edges.length; i++) {
 		let d = edges[i].data || {};
 		if (!d.themed_default) continue;
-		let stroke = d.is_tree ? dark ? "#22a7c2" : "#0e7490" : dark ? "#8b94a3" : "#6b7280";
 		updates.push({
 			id: edges[i].id,
-			style: { stroke }
+			style: { stroke: default_edge_stroke(gobj, d, theme) }
 		});
 	}
 	if (updates.length > 0) graph.updateEdgeData(updates);
@@ -63900,21 +63954,54 @@ function apply_edge_properties(gobj, edge_id, lineWidth, stroke, scope) {
 	deselect_edge(gobj);
 }
 /************************************************************
+*  The colour a link is DRAWN in: the colour of the two knobs it
+*  joins.
+*
+*  Both ends of a link wear the CHILD topic's colour -- the
+*  parent's hook port is painted with the colour of whatever may
+*  hang there, and the child's fkey port with its own (see
+*  build_ports) -- so the line between them has one obvious
+*  colour, and a reader follows a link by its hue instead of
+*  tracing a grey thread across the canvas.
+*
+*  It goes through port_rim(): the FILL of a port says which
+*  topic, and a line on the canvas is a graphical object that
+*  needs 3:1 against it, which that mix clears in both themes
+*  (9.11 dark, 3.80 light) while keeping the hue. So a link is
+*  drawn in exactly the colour of the rim of the two knobs it
+*  ends on.
+*
+*  The containment/tree relation (parent and child of the same
+*  topic) is no longer marked by a teal of its own -- it is that
+*  topic's colour like any other link, and what still tells it
+*  apart is its WIDTH.
+*
+*  A topic with no colour, or an edge of a graph with no schema
+*  yet, keeps the neutral grey this used to give everything.
+************************************************************/
+function default_edge_stroke(gobj, d, theme) {
+	let priv = gobj.priv;
+	let desc = (0, _yuneta_gobj_js.is_object)(priv.descs) ? priv.descs[d.child_topic] : null;
+	if (desc && desc.color) return port_rim(desc.color, theme);
+	let dark = theme === "dark";
+	return d.is_tree ? dark ? "#22a7c2" : "#0e7490" : dark ? "#8b94a3" : "#6b7280";
+}
+/************************************************************
 *  The style an edge INHERITS, before anything saved for the
 *  edge itself: its hook's default in the parent topic, else the
 *  parent topic's default for every edge, else the library's.
 *
-*  The library's: neutral grey, teal for the containment/tree
-*  relation (parent and child of the same topic, a
-*  self-hierarchy). `themed_default` says the colour is still the
-*  library's, so a theme toggle re-themes it and leaves a chosen
-*  one alone.
+*  The library's: the colour of the ports it joins (see
+*  default_edge_stroke), and a wider line for the
+*  containment/tree relation. `themed_default` says the colour is
+*  still the library's, so a theme toggle re-themes it and leaves
+*  a chosen one alone.
 ************************************************************/
 function edge_inherited_style_of(gobj, d) {
-	let dark = gobj.priv.theme === "dark";
+	let priv = gobj.priv;
 	let style = {
 		lineWidth: d.is_tree ? 2 : 1.6,
-		stroke: d.is_tree ? dark ? "#22a7c2" : "#0e7490" : dark ? "#8b94a3" : "#6b7280",
+		stroke: default_edge_stroke(gobj, d, priv.theme),
 		themed_default: true
 	};
 	let defs = topic_defaults_of(gobj, d.parent_topic);
@@ -71735,7 +71822,7 @@ function render_toolbar(gobj) {
 	]);
 	let $right = [];
 	if (priv.treedb_id && has_model) {
-		$right.push(toolbar_button("SCHEMA_DIAGRAM_BTN", "yi-hexagon-nodes", priv.diagram ? "topics" : "diagram", "EV_TOGGLE_DIAGRAM", false));
+		$right.push(toolbar_button("SCHEMA_DIAGRAM_BTN", "yi-compass-drafting", priv.diagram ? "topics" : "diagram", "EV_TOGGLE_DIAGRAM", false));
 		$right.push(toolbar_button("SCHEMA_VALIDATE_BTN", "yi-square-check", "check", "EV_VALIDATE", false));
 		$right.push(toolbar_button("SCHEMA_EXPORT_BTN", "yi-download", "export", "EV_EXPORT", false));
 		if (!readonly) $right.push(toolbar_button("SCHEMA_IMPORT_BTN", "yi-upload", "import", "EV_IMPORT", false));