@yuneta/gobj-ui 7.23.19 → 7.23.20

package/dist/gobj-ui.es.js

@@ -10159,6 +10159,268 @@ function ensure_drag_canvas_patch() {
 	register(ExtensionCategory.BEHAVIOR, "drag-canvas", DragCanvasTouch);
 	__drag_canvas_patched__ = true;
 }
+/************************************************************
+*   JSON type discriminator (viewer vocabulary)
+************************************************************/
+function json_type(value) {
+	if (value === null) return "null";
+	if (Array.isArray(value)) return "array";
+	switch (typeof value) {
+		case "string": return "string";
+		case "number": return "number";
+		case "boolean": return "boolean";
+		case "object": return "object";
+		default: return "unknown";
+	}
+}
+/************************************************************
+*   Detect a kw_collapse() sentinel.
+*
+*   The kernel replaces an over-limit dict with:
+*          { "__collapsed__": { "path": ..., "size": N } }
+*   and an over-limit array with:
+*          [ { "__collapsed__": { "path": ..., "size": N } } ]
+*
+*   Returns { size, path, is_array } or null.
+************************************************************/
+function is_collapsed(value) {
+	if (value && typeof value === "object" && !Array.isArray(value)) {
+		let keys = Object.keys(value);
+		if (keys.length === 1 && keys[0] === "__collapsed__") {
+			let c = value.__collapsed__ || {};
+			return {
+				size: c.size,
+				path: c.path,
+				is_array: false
+			};
+		}
+		return null;
+	}
+	if (Array.isArray(value) && value.length === 1) {
+		let e = value[0];
+		if (e && typeof e === "object" && !Array.isArray(e) && Object.keys(e).length === 1 && e.__collapsed__) {
+			let c = e.__collapsed__ || {};
+			return {
+				size: c.size,
+				path: c.path,
+				is_array: true
+			};
+		}
+	}
+	return null;
+}
+/************************************************************
+*   Join / split absolute path segments (kernel convention)
+************************************************************/
+function seg_join(segments) {
+	return segments.map(function(s) {
+		return String(s);
+	}).join("`");
+}
+function seg_split(path) {
+	if (path === "" || path === null || path === void 0) return [];
+	return path.split("`");
+}
+/************************************************************
+*   Walk a JSON tree by absolute segments; undefined if the
+*   path does not resolve.
+************************************************************/
+function get_by_segments(root, segments) {
+	let v = root;
+	for (let seg of segments) {
+		if (v === null || v === void 0) return;
+		if (Array.isArray(v)) v = v[Number(seg)];
+		else if (typeof v === "object") v = v[seg];
+		else return;
+	}
+	return v;
+}
+/************************************************************
+*   Set a value at absolute segments (mutates root).
+*
+*   segments == [] means "replace the whole root" — the caller
+*   must use the RETURNED value in that case (a primitive/array
+*   root cannot be mutated in place).
+************************************************************/
+function set_by_segments(root, segments, new_value) {
+	if (segments.length === 0) return new_value;
+	let parent = get_by_segments(root, segments.slice(0, -1));
+	if (parent === null || parent === void 0 || typeof parent !== "object") return root;
+	let last = segments[segments.length - 1];
+	if (Array.isArray(parent)) parent[Number(last)] = new_value;
+	else parent[last] = new_value;
+	return root;
+}
+/************************************************************
+*   Does `value` (or any loaded descendant / its own key)
+*   contain the lower-cased search term?
+*
+*   Collapsed (not-yet-loaded) subtrees can't be searched, so
+*   they never match on content — only their key can match,
+*   which the renderer checks separately.
+************************************************************/
+function subtree_matches(value, term) {
+	if (!term) return true;
+	if (is_collapsed(value)) return false;
+	let type = json_type(value);
+	if (type === "object") {
+		for (let [k, v] of Object.entries(value)) {
+			if (String(k).toLowerCase().includes(term)) return true;
+			if (subtree_matches(v, term)) return true;
+		}
+		return false;
+	}
+	if (type === "array") {
+		for (let v of value) if (subtree_matches(v, term)) return true;
+		return false;
+	}
+	return String(value).toLowerCase().includes(term);
+}
+/************************************************************
+*   Fields whose numeric value is an epoch timestamp.
+*   Mirrors the timestampTag list wired into C_YUI_FORM's
+*   jsoneditor control, so the two viewers agree.
+************************************************************/
+function is_time_field(field) {
+	return field === "__t__" || field === "__tm__" || field === "tm" || field === "t" || field === "time" || field === "from_t" || field === "to_t" || field === "t_input" || field === "t_output" || field === "from_tm" || field === "to_tm";
+}
+/************************************************************
+*   Format an epoch value as a local wall-clock string.
+*   Accepts seconds or milliseconds; returns null when the
+*   value is not a usable positive timestamp (0 == "unset").
+************************************************************/
+function format_epoch(value) {
+	if (typeof value !== "number" || !isFinite(value) || value <= 0) return null;
+	let ms = Math.abs(value) < 0xe8d4a51000 ? value * 1e3 : value;
+	let d = new Date(ms);
+	if (isNaN(d.getTime())) return null;
+	return d.toLocaleString();
+}
+/************************************************************
+*   The text view's payload: the document as text, indented
+*   four characters, cut at `max_chars`.
+*
+*   Returns {text, capped}.  `capped` is what the caller
+*   announces under the dump — a cut that is not announced
+*   reads as a document that ends there.
+************************************************************/
+function json_text_dump(root, max_chars) {
+	let text;
+	try {
+		text = JSON.stringify(root, null, 4);
+	} catch (e) {
+		return {
+			text: "",
+			capped: false,
+			error: String(e)
+		};
+	}
+	if (text === void 0) return {
+		text: "",
+		capped: false,
+		error: "not representable as JSON"
+	};
+	if (typeof max_chars === "number" && max_chars > 0 && text.length > max_chars) return {
+		text: text.slice(0, max_chars),
+		capped: true
+	};
+	return {
+		text,
+		capped: false
+	};
+}
+/************************************************************
+*   Which view a freshly mounted viewer opens on.
+*
+*   Three answers, in order of authority: what the HOST asked
+*   for, what the READER chose last time, and `fallback`.
+*
+*   The host wins because a viewer mounted to show a graph has
+*   to show one.  The memory comes next, because reopening a
+*   document in the view you just left is the whole point of
+*   remembering it.  `fallback` is the floor.
+*
+*   Anything not in `modes` is treated as unsaid, which covers
+*   an absent value, an empty one, and a stored string from an
+*   older release that named a view no longer offered.
+************************************************************/
+function pick_view_mode(asked, remembered, modes, fallback) {
+	let known = (m) => Array.isArray(modes) && modes.indexOf(m) >= 0;
+	if (known(asked)) return asked;
+	if (known(remembered)) return remembered;
+	return fallback;
+}
+/************************************************************
+*   The short label a container row carries beside its size.
+*
+*   An array of dicts that carry an `id` is a list of RECORDS,
+*   and a row that says only `2: {15}` makes you open all
+*   fifteen fields of every one of them to find out WHICH
+*   record it is.  The id is the one field that answers that,
+*   so the row says it without being opened.
+*
+*   Only a SCALAR id, and only when it is really there: an `id`
+*   that is itself a dict or a list is not a name, it is more
+*   document, and printing `[object Object]` beside the size
+*   would be worse than printing nothing.
+*
+*   Cut at `max_chars`, because this rides on a row whose job
+*   is to stay one line.
+************************************************************/
+function container_label(value, max_chars) {
+	if (value === null || typeof value !== "object" || Array.isArray(value)) return "";
+	if (!Object.prototype.hasOwnProperty.call(value, "id")) return "";
+	let id = value.id;
+	let t = typeof id;
+	if (t !== "string" && t !== "number" && t !== "boolean") return "";
+	let text = String(id).trim();
+	if (text === "") return "";
+	let cap = typeof max_chars === "number" && max_chars > 0 ? max_chars : 0;
+	if (cap && text.length > cap) return text.slice(0, cap) + "…";
+	return text;
+}
+/************************************************************
+*   A dict, in the JSON sense: not an array and not null.
+************************************************************/
+function is_plain_object(v) {
+	return v !== null && typeof v === "object" && !Array.isArray(v);
+}
+/************************************************************
+*  Does this container hold ONLY other containers?
+*
+*  Such a value is not a thing, it is a LIST of things -- and a
+*  list is fully described by the row that names it in its
+*  parent, plus the edges to what it holds.  Drawing it as a
+*  card of its own put a node in the middle of the graph with no
+*  data in it, saying nothing the parent's row did not already
+*  say, and pushed everything below it one level down.
+*
+*  An EMPTY container inside counts as content: `{0}` is
+*  something the card has to show, and there is no child card
+*  to show it instead.
+************************************************************/
+function is_pure_collection(value) {
+	let entries = is_plain_object(value) ? Object.entries(value) : Array.isArray(value) ? value.map((v, i) => [i, v]) : [];
+	if (entries.length === 0) return false;
+	for (let [, v] of entries) if (!has_branch(v)) return false;
+	return true;
+}
+/************************************************************
+*  A value that gets a card, or children, of its own.
+************************************************************/
+function has_branch(value) {
+	return is_plain_object(value) && Object.keys(value).length > 0 || Array.isArray(value) && value.length > 0;
+}
+/************************************************************
+*  How many branches a container has, which is what the fold
+*  chip counts.
+************************************************************/
+function count_branches(value) {
+	let entries = is_plain_object(value) ? Object.values(value) : Array.isArray(value) ? value : [];
+	let n = 0;
+	for (let v of entries) if (has_branch(v)) n++;
+	return n;
+}
 //#endregion
 //#region src/c_yui_json_graph.js
 /***********************************************************************
@@ -10669,7 +10931,7 @@ function build_graph$3(gobj) {
 /************************************************************
 *  Build cell value HTML (matching old mx_json_viewer colors)
 ************************************************************/
-function build_cell_html(key, value, type, dark, matched) {
+function build_cell_html(key, value, type, dark, matched, fold) {
 	let on_light = matched ? false : dark;
 	let color = type_color(type, on_light);
 	let key_color = json_card_style(GROUP_COLORS.dict, on_light).key;
@@ -10696,6 +10958,7 @@ function build_cell_html(key, value, type, dark, matched) {
 		default: display_value = String(value);
 	}
 	let row = `<span style="color:${key_color}">• ${escapeHtml(String(key))}: </span><span style="color:${color}">${display_value}</span>`;
+	if (fold) row += `<span style="margin-left:8px;">` + fold_toggle_html(fold.path, true, fold.folded, fold.branches, fold.colors) + `</span>`;
 	if (matched) row = `<span style="background:#ffe082; border-radius:2px; padding:0 2px;">${row}</span>`;
 	return row;
 }
@@ -10819,6 +11082,7 @@ function build_json_nodes(gobj, path, kw, nodes, edges, parent_id) {
 	let lines = [];
 	let pending_complex = [];
 	let card_matched = false;
+	let colors = json_card_style(is_dict ? GROUP_COLORS.dict : GROUP_COLORS.list, dark);
 	let entries = is_dict ? Object.entries(kw) : kw.map((v, i) => [i, v]);
 	for (let [key, value] of entries) {
 		let type = get_json_type(value);
@@ -10827,20 +11091,32 @@ function build_json_nodes(gobj, path, kw, nodes, edges, parent_id) {
 			card_matched = true;
 			priv.match_count++;
 		}
-		if (is_object(value) && json_object_size(value) > 0 || is_array(value) && value.length > 0) {
+		let fold = null;
+		if (has_branch(value)) {
 			pending_complex.push({
 				key,
 				value
 			});
-			continue;
+			if (is_pure_collection(value)) {
+				let child_path = add_segment(path, key);
+				fold = {
+					path: child_path,
+					folded: priv.collapsed.has(child_path),
+					branches: count_branches(value),
+					colors
+				};
+			}
 		}
-		lines.push(build_cell_html(key, value, type, dark, matched));
+		lines.push(build_cell_html(key, value, type, dark, matched, fold));
+	}
+	if (parent_id && is_pure_collection(kw)) {
+		if (priv.collapsed.has(path)) return parent_id;
+		for (let pending of pending_complex) build_json_nodes(gobj, add_segment(path, pending.key), pending.value, nodes, edges, parent_id);
+		return parent_id;
 	}
 	let label = get_group_label(path) || (is_dict ? "{}" : "[]");
-	if (pending_complex.length > 0) label += is_dict ? ` {${pending_complex.length}}` : ` [${pending_complex.length}]`;
 	let foldable = pending_complex.length > 0;
 	let folded = foldable && priv.collapsed.has(path);
-	let colors = json_card_style(is_dict ? GROUP_COLORS.dict : GROUP_COLORS.list, dark);
 	let border_color = card_matched ? dark ? "#ffb300" : "#ff8f00" : colors.border;
 	let border_width = card_matched ? 2 : 1;
 	let content_html = lines.map((line) => `<div style="font-family:monospace; font-size:13px; padding:1px 6px; white-space:nowrap;">${line}</div>`).join("");
@@ -10934,22 +11210,25 @@ function load_json(gobj) {
 }
 /************************************************************
 *  Every path that HAS a branch to fold, in the same recursion
-*  build_json_nodes uses — so "collapse all" can never name a
-*  card that does not exist.  The root is excluded: folding it
+*  build_json_nodes uses — so "collapse all" can never name
+*  something with no handle.  The handle is a card's header chip
+*  for a container that gets a card, and the chip on its ROW in
+*  the parent for a pure collection, which gets none; both are
+*  keyed by this same path.  The root is excluded: folding it
 *  would leave an empty canvas.
 ************************************************************/
 function collect_foldable_paths(value, path, out, is_root) {
 	let is_dict = is_object(value);
 	let is_list = is_array(value);
 	if (!is_dict && !is_list) return false;
-	let has_branch = false;
+	let found_branch = false;
 	let entries = is_dict ? Object.entries(value) : value.map((v, i) => [i, v]);
-	for (let [key, child] of entries) if (is_object(child) && json_object_size(child) > 0 || is_array(child) && child.length > 0) {
-		has_branch = true;
+	for (let [key, child] of entries) if (has_branch(child)) {
+		found_branch = true;
 		collect_foldable_paths(child, add_segment(path, key), out, false);
 	}
-	if (has_branch && !is_root) out.push(path);
-	return has_branch;
+	if (found_branch && !is_root) out.push(path);
+	return found_branch;
 }
 /************************************************************
 *  Show the find count, or hide the chip when there is no
@@ -11508,226 +11787,6 @@ function register_c_yui_json_graph() {
 	if (gclass_find_by_name(GCLASS_NAME$11, false)) return 0;
 	return create_gclass$11(GCLASS_NAME$11);
 }
-/************************************************************
-*   JSON type discriminator (viewer vocabulary)
-************************************************************/
-function json_type(value) {
-	if (value === null) return "null";
-	if (Array.isArray(value)) return "array";
-	switch (typeof value) {
-		case "string": return "string";
-		case "number": return "number";
-		case "boolean": return "boolean";
-		case "object": return "object";
-		default: return "unknown";
-	}
-}
-/************************************************************
-*   Detect a kw_collapse() sentinel.
-*
-*   The kernel replaces an over-limit dict with:
-*          { "__collapsed__": { "path": ..., "size": N } }
-*   and an over-limit array with:
-*          [ { "__collapsed__": { "path": ..., "size": N } } ]
-*
-*   Returns { size, path, is_array } or null.
-************************************************************/
-function is_collapsed(value) {
-	if (value && typeof value === "object" && !Array.isArray(value)) {
-		let keys = Object.keys(value);
-		if (keys.length === 1 && keys[0] === "__collapsed__") {
-			let c = value.__collapsed__ || {};
-			return {
-				size: c.size,
-				path: c.path,
-				is_array: false
-			};
-		}
-		return null;
-	}
-	if (Array.isArray(value) && value.length === 1) {
-		let e = value[0];
-		if (e && typeof e === "object" && !Array.isArray(e) && Object.keys(e).length === 1 && e.__collapsed__) {
-			let c = e.__collapsed__ || {};
-			return {
-				size: c.size,
-				path: c.path,
-				is_array: true
-			};
-		}
-	}
-	return null;
-}
-/************************************************************
-*   Join / split absolute path segments (kernel convention)
-************************************************************/
-function seg_join(segments) {
-	return segments.map(function(s) {
-		return String(s);
-	}).join("`");
-}
-function seg_split(path) {
-	if (path === "" || path === null || path === void 0) return [];
-	return path.split("`");
-}
-/************************************************************
-*   Walk a JSON tree by absolute segments; undefined if the
-*   path does not resolve.
-************************************************************/
-function get_by_segments(root, segments) {
-	let v = root;
-	for (let seg of segments) {
-		if (v === null || v === void 0) return;
-		if (Array.isArray(v)) v = v[Number(seg)];
-		else if (typeof v === "object") v = v[seg];
-		else return;
-	}
-	return v;
-}
-/************************************************************
-*   Set a value at absolute segments (mutates root).
-*
-*   segments == [] means "replace the whole root" — the caller
-*   must use the RETURNED value in that case (a primitive/array
-*   root cannot be mutated in place).
-************************************************************/
-function set_by_segments(root, segments, new_value) {
-	if (segments.length === 0) return new_value;
-	let parent = get_by_segments(root, segments.slice(0, -1));
-	if (parent === null || parent === void 0 || typeof parent !== "object") return root;
-	let last = segments[segments.length - 1];
-	if (Array.isArray(parent)) parent[Number(last)] = new_value;
-	else parent[last] = new_value;
-	return root;
-}
-/************************************************************
-*   Does `value` (or any loaded descendant / its own key)
-*   contain the lower-cased search term?
-*
-*   Collapsed (not-yet-loaded) subtrees can't be searched, so
-*   they never match on content — only their key can match,
-*   which the renderer checks separately.
-************************************************************/
-function subtree_matches(value, term) {
-	if (!term) return true;
-	if (is_collapsed(value)) return false;
-	let type = json_type(value);
-	if (type === "object") {
-		for (let [k, v] of Object.entries(value)) {
-			if (String(k).toLowerCase().includes(term)) return true;
-			if (subtree_matches(v, term)) return true;
-		}
-		return false;
-	}
-	if (type === "array") {
-		for (let v of value) if (subtree_matches(v, term)) return true;
-		return false;
-	}
-	return String(value).toLowerCase().includes(term);
-}
-/************************************************************
-*   Fields whose numeric value is an epoch timestamp.
-*   Mirrors the timestampTag list wired into C_YUI_FORM's
-*   jsoneditor control, so the two viewers agree.
-************************************************************/
-function is_time_field(field) {
-	return field === "__t__" || field === "__tm__" || field === "tm" || field === "t" || field === "time" || field === "from_t" || field === "to_t" || field === "t_input" || field === "t_output" || field === "from_tm" || field === "to_tm";
-}
-/************************************************************
-*   Format an epoch value as a local wall-clock string.
-*   Accepts seconds or milliseconds; returns null when the
-*   value is not a usable positive timestamp (0 == "unset").
-************************************************************/
-function format_epoch(value) {
-	if (typeof value !== "number" || !isFinite(value) || value <= 0) return null;
-	let ms = Math.abs(value) < 0xe8d4a51000 ? value * 1e3 : value;
-	let d = new Date(ms);
-	if (isNaN(d.getTime())) return null;
-	return d.toLocaleString();
-}
-/************************************************************
-*   The text view's payload: the document as text, indented
-*   four characters, cut at `max_chars`.
-*
-*   Returns {text, capped}.  `capped` is what the caller
-*   announces under the dump — a cut that is not announced
-*   reads as a document that ends there.
-************************************************************/
-function json_text_dump(root, max_chars) {
-	let text;
-	try {
-		text = JSON.stringify(root, null, 4);
-	} catch (e) {
-		return {
-			text: "",
-			capped: false,
-			error: String(e)
-		};
-	}
-	if (text === void 0) return {
-		text: "",
-		capped: false,
-		error: "not representable as JSON"
-	};
-	if (typeof max_chars === "number" && max_chars > 0 && text.length > max_chars) return {
-		text: text.slice(0, max_chars),
-		capped: true
-	};
-	return {
-		text,
-		capped: false
-	};
-}
-/************************************************************
-*   Which view a freshly mounted viewer opens on.
-*
-*   Three answers, in order of authority: what the HOST asked
-*   for, what the READER chose last time, and `fallback`.
-*
-*   The host wins because a viewer mounted to show a graph has
-*   to show one.  The memory comes next, because reopening a
-*   document in the view you just left is the whole point of
-*   remembering it.  `fallback` is the floor.
-*
-*   Anything not in `modes` is treated as unsaid, which covers
-*   an absent value, an empty one, and a stored string from an
-*   older release that named a view no longer offered.
-************************************************************/
-function pick_view_mode(asked, remembered, modes, fallback) {
-	let known = (m) => Array.isArray(modes) && modes.indexOf(m) >= 0;
-	if (known(asked)) return asked;
-	if (known(remembered)) return remembered;
-	return fallback;
-}
-/************************************************************
-*   The short label a container row carries beside its size.
-*
-*   An array of dicts that carry an `id` is a list of RECORDS,
-*   and a row that says only `2: {15}` makes you open all
-*   fifteen fields of every one of them to find out WHICH
-*   record it is.  The id is the one field that answers that,
-*   so the row says it without being opened.
-*
-*   Only a SCALAR id, and only when it is really there: an `id`
-*   that is itself a dict or a list is not a name, it is more
-*   document, and printing `[object Object]` beside the size
-*   would be worse than printing nothing.
-*
-*   Cut at `max_chars`, because this rides on a row whose job
-*   is to stay one line.
-************************************************************/
-function container_label(value, max_chars) {
-	if (value === null || typeof value !== "object" || Array.isArray(value)) return "";
-	if (!Object.prototype.hasOwnProperty.call(value, "id")) return "";
-	let id = value.id;
-	let t = typeof id;
-	if (t !== "string" && t !== "number" && t !== "boolean") return "";
-	let text = String(id).trim();
-	if (text === "") return "";
-	let cap = typeof max_chars === "number" && max_chars > 0 ? max_chars : 0;
-	if (cap && text.length > cap) return text.slice(0, cap) + "…";
-	return text;
-}
 //#endregion
 //#region src/c_yui_json.js
 /***********************************************************************

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuneta/gobj-ui",
-  "version": "7.23.19",
+  "version": "7.23.20",
   "type": "module",
   "main": "dist/gobj-ui.cjs.js",
   "module": "dist/gobj-ui.es.js",