@yuneta/gobj-js 7.25.6 → 7.25.8

package/dist/gobj-js.es.js

@@ -2953,11 +2953,10 @@ function gobj_publish_event(publisher, event, kw) {
 			let __global__ = kw_get_dict(publisher, subs, "__global__", null, 0);
 			let __local__ = kw_get_dict(publisher, subs, "__local__", null, 0);
 			let __filter__ = kw_get_dict_value(publisher, subs, "__filter__", null, 0);
-			let kw2publish = kw;
 			let topublish = 1;
-			if (publisher.gclass.gmt.mt_publication_filter) topublish = publisher.gclass.gmt.mt_publication_filter(publisher, event, kw2publish, subscriber);
+			if (publisher.gclass.gmt.mt_publication_filter) topublish = publisher.gclass.gmt.mt_publication_filter(publisher, event, kw, subscriber);
 			else if (json_size(__filter__) > 0) {
-				topublish = kw_match_simple(kw2publish, __filter__) ? 1 : 0;
+				topublish = kw_match_simple(kw, __filter__) ? 1 : 0;
 				if (tracea) {
 					trace_machine(sprintf("💜💜🔄%s publishing with filter, event '%s', subscriber'%s', publisher %s", topublish ? "👍" : "👎", event ? event : "", gobj_short_name(subscriber), gobj_short_name(publisher)));
 					trace_json(__filter__);
@@ -2971,9 +2970,11 @@ function gobj_publish_event(publisher, event, kw) {
 					if (!gobj_has_event(subscriber, ev_.event_name, 0)) continue;
 				}
 			}
-			if (__local__) kw_pop(kw2publish, __local__);
+			let kw2publish = kw;
+			if (json_size(__local__) > 0 || json_size(__global__) > 0) kw2publish = Object.assign({}, kw);
+			if (json_size(__local__) > 0) kw_pop(kw2publish, __local__);
 			if (__config__) {}
-			if (__global__) json_object_update(kw2publish, __global__);
+			if (json_size(__global__) > 0) json_object_update(kw2publish, json_deep_copy(__global__));
 			if (tracea) {
 				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)));
@@ -3977,7 +3978,12 @@ function kw_set_dict_value(gobj, kw, path, value) {
 		let key = ss[i];
 		if (i === len - 1) kw[key] = value;
 		else {
-			if (kw[key] === void 0) kw[key] = {};
+			let seg = kw[key];
+			if (seg === void 0) kw[key] = {};
+			else if (!is_object(seg) && !is_array(seg)) {
+				log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}kw_set_dict_value(): segment '${key}' is not a dict or a list: '${path}'`);
+				return -1;
+			}
 			kw = kw[key];
 		}
 	}
@@ -6701,7 +6707,8 @@ function mt_inject_event(gobj, event, kw, src) {
 		window.console.error(`Not in session`);
 		return -1;
 	}
-	if (!kw) kw = {};
+	kw = Object.assign({}, is_object(kw) ? kw : {});
+	if (is_object(kw["__md_iev__"])) kw["__md_iev__"] = json_deep_copy(kw["__md_iev__"]);
 	if (msg_iev_get_stack(gobj, kw, IEVENT_STACK_ID)) {} else {
 		let jn_ievent_id = build_cli_ievent_request(gobj, gobj_name(src), kw_get_str(gobj, kw, "__service__", 0, 0));
 		json_object_del(kw, "__service__");