@yuneta/gobj-js 7.13.6 → 7.13.8

package/dist/gobj-js.umd.js

@@ -387,7 +387,7 @@
 	function tab() {
 		return " ".repeat(Math.max(1, __inside__ * 2));
 	}
-	var __trace_machine_format__ = 0;
+	var __trace_machine_format__ = 1;
 	function gobj_set_trace_machine_format(format) {
 		__trace_machine_format__ = Number(format) === 1 ? 1 : 0;
 	}
@@ -2300,7 +2300,9 @@
 		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;
 	}
 	/***************************************************************************
@@ -2493,7 +2495,8 @@
 			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);
@@ -2874,8 +2877,9 @@
 		}
 		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);
@@ -2922,8 +2926,9 @@
 				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__) {