@yuneta/gobj-js 7.13.7 → 7.16.0

package/dist/gobj-js.cjs.js

@@ -2297,7 +2297,9 @@ function gobj_change_state(gobj, state_name) {
 	gobj.current_state = new_state;
 	let tracea = is_machine_tracing(gobj, "EV_STATE_CHANGED");
 	let tracea_states = __trace_gobj_states__(gobj) ? true : false;
-	if (tracea || tracea_states) trace_machine(sprintf("🔀🔀 mach(%s%s^%s), new st(%s), prev st(%s)", !gobj.running ? "!!" : "", gobj_gclass_name(gobj), gobj_name(gobj), gobj_current_state(gobj), gobj.last_state.state_name));
+	if (tracea || tracea_states) {
+		if (__trace_machine_format__ === 1) {} else trace_machine(sprintf("🔀🔀 mach(%s%s^%s), new st(%s), prev st(%s)", !gobj.running ? "!!" : "", gobj_gclass_name(gobj), gobj_name(gobj), gobj_current_state(gobj), gobj.last_state.state_name));
+	}
 	return true;
 }
 /***************************************************************************
@@ -2490,7 +2492,8 @@ function gobj_send_event(dst, event, kw, src) {
 		if (dst.gclass.gmt.mt_inject_event) {
 			__inside__--;
 			if (tracea) {
-				trace_machine(sprintf("🔃 mach(%s%s), st: %s, ev: %s, from(%s%s)", !dst.running ? "!!" : "", gobj_short_name(dst), state.state_name, event ? event : "", src && !src.running ? "!!" : "", gobj_short_name(src)));
+				if (__trace_machine_format__ === 1) trace_machine(sprintf("🔜 %s %s%s %s", event ? event : "", !dst.running ? "!!" : "", gobj_short_name(dst), state.state_name));
+				else trace_machine(sprintf("🔃 mach(%s%s), st: %s, ev: %s, from(%s%s)", !dst.running ? "!!" : "", gobj_short_name(dst), state.state_name, event ? event : "", src && !src.running ? "!!" : "", gobj_short_name(src)));
 				if (kw) {
 					if (tracea > 1) {
 						if (json_object_size(kw)) trace_json(kw);
@@ -2871,8 +2874,9 @@ function gobj_publish_event(publisher, event, kw) {
 	}
 	let tracea = __yuno__ && gobj_read_bool_attr(__yuno__, "trace_subscriptions");
 	if (tracea) {
-		trace_machine(sprintf("🔝🔝 mach(%s%s^%s), st: %s, ev: %s%s%s", !publisher.running ? "!!" : "", gobj_gclass_name(publisher), gobj_name(publisher), publisher.current_state.state_name, "", event ? event : "", ""));
-		trace_json(kw);
+		if (__trace_machine_format__ === 1) trace_machine(sprintf("🔝🔝 %s %s%s %s", event ? event : "", !publisher.running ? "!!" : "", gobj_short_name(publisher), publisher.current_state.state_name));
+		else trace_machine(sprintf("🔝🔝 mach(%s%s^%s), st: %s, ev: %s%s%s", !publisher.running ? "!!" : "", gobj_gclass_name(publisher), gobj_name(publisher), publisher.current_state.state_name, "", event ? event : "", ""));
+		if (json_object_size(kw)) trace_json(kw);
 	}
 	if (publisher.gclass.gmt.mt_publish_event) {
 		let topublish = publisher.gclass.gmt.mt_publish_event(publisher, event, kw);
@@ -2919,8 +2923,9 @@ function gobj_publish_event(publisher, event, kw) {
 			if (__config__) {}
 			if (__global__) json_object_update(kw2publish, __global__);
 			if (tracea) {
-				trace_machine(sprintf("🔝🔄 mach(%s%s), st: %s, ev: %s, from(%s%s)", !subscriber.running ? "!!" : "", gobj_short_name(subscriber), gobj_current_state(subscriber), event ? event : "", publisher && !publisher.running ? "!!" : "", gobj_short_name(publisher)));
-				trace_json(kw2publish);
+				if (__trace_machine_format__ === 1) trace_machine(sprintf("🔝🔄 %s (%s) %s%s", event ? event : "", event ? event : "", !subscriber.running ? "!!" : "", gobj_short_name(subscriber)));
+				else trace_machine(sprintf("🔝🔄 mach(%s%s), st: %s, ev: %s, from(%s%s)", !subscriber.running ? "!!" : "", gobj_short_name(subscriber), gobj_current_state(subscriber), event ? event : "", publisher && !publisher.running ? "!!" : "", gobj_short_name(publisher)));
+				if (json_object_size(kw2publish)) trace_json(kw2publish);
 			}
 			let ret_ = gobj_send_event(subscriber, event, kw2publish, publisher);
 			if (ret_ < 0 && subs_flag & subs_flag_t.__own_event__) {
@@ -5095,6 +5100,234 @@ function build_path(...segments) {
 	}
 	return result;
 }
+/***************************************
+*      Flat json (id -> value)
+***************************************/
+/************************************************************
+*  THE FLAT FORM, AND WHY IT IS SHAPED LIKE THIS
+*
+*  A json seen as a table: one row per LEAF, the id being the
+*  PATH of the item and the value its value. Easier to store,
+*  to compare and to diff than the nested form, and the only
+*  one a person can read when two configurations disagree.
+*
+*      {a: {b: 1}, c: [10, 20]}
+*          ->  {"a`b": 1, "c`[0]": 10, "c`[1]": 20}
+*
+*  Same grammar as the C side (kwid.c), because the point is
+*  that a flat json written by either can be read by the other:
+*
+*      - segments joined by '`', the SDK's own path delimiter;
+*      - a literal '`' in a key is DOUBLED, so no key is
+*        forbidden -- a dict keyed by "1630" is a dict, not an
+*        array of 1631 elements, which is what the first C
+*        implementation answered;
+*      - an array index is '[N]', canonical, no leading zeros;
+*      - a dict key starting with '[' doubles it ('[[0]'), so it
+*        can never be read as an index;
+*      - AN EMPTY CONTAINER IS A LEAF: {} and [] hold no leaves,
+*        and 'properties': {} is everywhere in our configs.
+*
+*  flat2json() THROWS instead of guessing: an id used as leaf and
+*  as container would depend on the order the ids are read in.
+************************************************************/
+var FLAT_MAX_DEPTH = 256;
+var FLAT_MAX_INDEX = 1e5;
+/************************************************************
+*  Is this raw segment an array index, '[N]'?
+*  Returns the index, or null.
+************************************************************/
+function flat_seg_index(seg) {
+	if (typeof seg !== "string" || seg.length < 3 || seg[0] !== "[") return null;
+	if (seg[seg.length - 1] !== "]") return null;
+	const body = seg.slice(1, -1);
+	if (!/^[0-9]+$/.test(body)) return null;
+	if (body.length > 1 && body[0] === "0") return null;
+	return parseInt(body, 10);
+}
+/************************************************************
+*  Escape one dict key.
+************************************************************/
+function flat_escape_key(key) {
+	const s = String(key).replace(/`/g, "``");
+	return s[0] === "[" ? "[" + s : s;
+}
+/************************************************************
+*  Compose a flat id from its segments.
+*
+*  A STRING segment is a dict key and gets escaped; a NUMBER is
+*  an array index and is written '[N]'. They are two types and
+*  not two spellings: as strings, the key "[0]" and the index 0
+*  would both be "[0]", which is the ambiguity '[N]' removes.
+************************************************************/
+function flat_key_join(segments) {
+	if (!Array.isArray(segments) || segments.length === 0) return "";
+	return segments.map((seg) => typeof seg === "number" ? `[${seg}]` : flat_escape_key(seg)).join("`");
+}
+/************************************************************
+*  Split a flat id into its segments, undoing the escapes.
+*
+*  An index comes back as a NUMBER and a dict key as a STRING.
+************************************************************/
+function flat_key_split(key) {
+	if (typeof key !== "string") return null;
+	let raw = [];
+	let cur = "";
+	for (let i = 0; i < key.length; i++) {
+		if (key[i] === "`") {
+			if (key[i + 1] === "`") {
+				cur += "`";
+				i++;
+				continue;
+			}
+			raw.push(cur);
+			cur = "";
+			continue;
+		}
+		cur += key[i];
+	}
+	raw.push(cur);
+	return raw.map((seg) => {
+		const idx = flat_seg_index(seg);
+		if (idx !== null) return idx;
+		if (seg[0] === "[" && seg[1] === "[") return seg.slice(1);
+		return seg;
+	});
+}
+/************************************************************
+*  Nested -> flat.
+************************************************************/
+function json2flat(jn) {
+	const flat = {};
+	const walk = (value, path, depth) => {
+		if (depth > FLAT_MAX_DEPTH) throw new Error(`json2flat: deeper than ${FLAT_MAX_DEPTH}`);
+		if (value !== null && typeof value === "object" && !Array.isArray(value)) {
+			const keys = Object.keys(value);
+			if (keys.length > 0) {
+				for (const key of keys) {
+					const seg = flat_escape_key(key);
+					walk(value[key], depth === 0 ? seg : path + "`" + seg, depth + 1);
+				}
+				return;
+			}
+		} else if (Array.isArray(value) && value.length > 0) {
+			value.forEach((child, index) => {
+				const seg = `[${index}]`;
+				walk(child, depth === 0 ? seg : path + "`" + seg, depth + 1);
+			});
+			return;
+		}
+		if (depth === 0) return;
+		flat[path] = value;
+	};
+	if (jn === void 0 || jn === null) return flat;
+	walk(jn, "", 0);
+	return flat;
+}
+/************************************************************
+*  Flat -> nested. Throws on the FIRST id that does not fit:
+*  rebuilding "most of it" is how a configuration comes back
+*  subtly different from the one that was saved.
+************************************************************/
+function flat2json(flat) {
+	if (flat === null || typeof flat !== "object" || Array.isArray(flat)) throw new Error("flat2json: a flat json is an object of id -> value");
+	let root = null;
+	for (const key of Object.keys(flat)) {
+		const segments = flat_key_split(key);
+		if (!segments || segments.length === 0) throw new Error(`flat2json: malformed flat id: '${key}'`);
+		if (segments.length > FLAT_MAX_DEPTH) throw new Error(`flat2json: '${key}' deeper than ${FLAT_MAX_DEPTH}`);
+		const first_is_index = typeof segments[0] === "number";
+		if (root === null) root = first_is_index ? [] : {};
+		else if (first_is_index !== Array.isArray(root)) throw new Error(`flat2json: '${key}' does not fit a ${Array.isArray(root) ? "array" : "object"} root`);
+		let current = root;
+		for (let i = 0; i < segments.length; i++) {
+			const seg = segments[i];
+			const is_index = typeof seg === "number";
+			const is_last = i === segments.length - 1;
+			const next_is_index = is_last ? false : typeof segments[i + 1] === "number";
+			if (is_index && seg > FLAT_MAX_INDEX) throw new Error(`flat2json: array index ${seg} over the limit (${FLAT_MAX_INDEX}) in '${key}'`);
+			if (is_index !== Array.isArray(current)) throw new Error(`flat2json: '${key}' uses a ${is_index ? "array index" : "key"} where the tree already has a ${Array.isArray(current) ? "array" : "object"}`);
+			if (is_last) {
+				if (Array.isArray(current)) {
+					while (current.length <= seg) current.push(null);
+					current[seg] = flat[key];
+				} else {
+					if (Object.prototype.hasOwnProperty.call(current, seg)) throw new Error(`flat2json: '${key}' is written twice, or once as a value and once as a container`);
+					current[seg] = flat[key];
+				}
+				break;
+			}
+			let child;
+			if (Array.isArray(current)) {
+				while (current.length <= seg) current.push(null);
+				child = current[seg];
+				if (child === null || child === void 0) {
+					child = next_is_index ? [] : {};
+					current[seg] = child;
+				}
+			} else {
+				child = current[seg];
+				if (child === void 0) {
+					child = next_is_index ? [] : {};
+					current[seg] = child;
+				}
+			}
+			if (child === null || typeof child !== "object") throw new Error(`flat2json: '${key}' walks through a value: the same id is a leaf and a container at once`);
+			if (next_is_index !== Array.isArray(child)) throw new Error(`flat2json: '${key}' needs a ${next_is_index ? "array" : "object"} where the tree already has a ${Array.isArray(child) ? "array" : "object"}`);
+			current = child;
+		}
+	}
+	return root === null ? {} : root;
+}
+/************************************************************
+*  Deep equality, for comparing two leaf values.
+************************************************************/
+function flat_value_equal(a, b) {
+	if (a === b) return true;
+	if (a === null || b === null || typeof a !== "object" || typeof b !== "object") return false;
+	return JSON.stringify(a) === JSON.stringify(b);
+}
+/************************************************************
+*  What changed between two flat dicts:
+*
+*      {added: {id: value}, removed: {id: value},
+*       changed: {id: {from, to}}}
+************************************************************/
+function flat_diff(flat1, flat2) {
+	const a = flat1 && typeof flat1 === "object" ? flat1 : {};
+	const b = flat2 && typeof flat2 === "object" ? flat2 : {};
+	const diff = {
+		added: {},
+		removed: {},
+		changed: {}
+	};
+	for (const key of Object.keys(a)) if (!Object.prototype.hasOwnProperty.call(b, key)) diff.removed[key] = a[key];
+	else if (!flat_value_equal(a[key], b[key])) diff.changed[key] = {
+		from: a[key],
+		to: b[key]
+	};
+	for (const key of Object.keys(b)) if (!Object.prototype.hasOwnProperty.call(a, key)) diff.added[key] = b[key];
+	return diff;
+}
+/************************************************************
+*  Apply that diff to a flat dict, which is MUTATED.
+*
+*  On the flat form on purpose: there an id addresses one value,
+*  so applying is setting and deleting, with nothing to walk and
+*  nothing to guess. Nested is json2flat -> flat_apply -> flat2json.
+************************************************************/
+function flat_apply(flat, diff) {
+	if (flat === null || typeof flat !== "object" || Array.isArray(flat)) throw new Error("flat_apply: a flat json is an object of id -> value");
+	if (diff === null || typeof diff !== "object") throw new Error("flat_apply: a diff is the object flat_diff() answers");
+	for (const key of Object.keys(diff.removed || {})) delete flat[key];
+	for (const key of Object.keys(diff.added || {})) flat[key] = diff.added[key];
+	for (const key of Object.keys(diff.changed || {})) {
+		const change = diff.changed[key];
+		if (!change || !Object.prototype.hasOwnProperty.call(change, "to")) throw new Error(`flat_apply: changed '${key}' without a 'to'`);
+		flat[key] = change.to;
+	}
+	return flat;
+}
 //#endregion
 //#region src/dbsimple.js
 /*********************************************************************************
@@ -6677,6 +6910,11 @@ exports.duplicate_objects = duplicate_objects;
 exports.empty_string = empty_string;
 exports.escapeHtml = escapeHtml;
 exports.event_flag_t = event_flag_t;
+exports.flat2json = flat2json;
+exports.flat_apply = flat_apply;
+exports.flat_diff = flat_diff;
+exports.flat_key_join = flat_key_join;
+exports.flat_key_split = flat_key_split;
 exports.gclass_add_ev_action = gclass_add_ev_action;
 exports.gclass_add_event_type = gclass_add_event_type;
 exports.gclass_add_state = gclass_add_state;
@@ -6804,6 +7042,7 @@ exports.jdb_get_by_idx = jdb_get_by_idx;
 exports.jdb_get_topic = jdb_get_topic;
 exports.jdb_init = jdb_init;
 exports.jdb_update = jdb_update;
+exports.json2flat = json2flat;
 exports.json_array_append = json_array_append;
 exports.json_array_append_new = json_array_append_new;
 exports.json_array_extend = json_array_extend;