@yuneta/gobj-js 7.25.5 → 7.25.7

package/dist/gobj-js.cjs.min.js

@@ -210,11 +210,11 @@ var T = class {
 	constructor(e, t, n) {
 		this.event_name = e, this.action = t, this.next_state = n;
 	}
-}, A = class {
+}, $ = class {
 	constructor(e) {
 		this.state_name = e, this.dl_actions = [];
 	}
-}, $ = class {
+}, A = class {
 	constructor(e, t) {
 		this.event_name = e, this.event_flag = Number(t) || 0;
 	}
@@ -592,7 +592,7 @@ function be(e, t) {
 	return null;
 }
 function me(e, t) {
-	return e instanceof j ? de(e, t) ? (gn(`state already exists: ${t}`), -1) : (e.dl_states.push(new A(t)), 0) : (gn("Cannot add state, typeof not GClass"), -1);
+	return e instanceof j ? de(e, t) ? (gn(`state already exists: ${t}`), -1) : (e.dl_states.push(new $(t)), 0) : (gn("Cannot add state, typeof not GClass"), -1);
 }
 function he(e, t, n, r, o) {
 	if (!(e instanceof j)) return gn("Cannot add state, typeof not GClass"), -1;
@@ -601,7 +601,7 @@ function he(e, t, n, r, o) {
 	return s ? be(s, n) ? (gn(`event already exists: gclass ${e.gclass_name}, state ${t}, event ${n}`), -1) : (s.dl_actions.push(new D(n, r, o)), 0) : (gn(`state not found: ${t}`), -1);
 }
 function Ee(e, t, n) {
-	Vn(t) || e.push(new $(t, n));
+	Vn(t) || e.push(new A(t, n));
 }
 function Te(e, t, n) {
 	return e instanceof j ? Ee(e.dl_events, t, n) : (gn("Cannot add state, typeof not GClass"), -1);
@@ -618,7 +618,7 @@ function ye(e, t) {
 function ve(e) {
 	if (!(e instanceof j)) return gn("Cannot add state, typeof not GClass"), -1;
 	let t = 0;
-	An(e.dl_states) || (gn(`GClass without states: ${e.gclass_name}`), t += -1);
+	$n(e.dl_states) || (gn(`GClass without states: ${e.gclass_name}`), t += -1);
 	for (let n = 0; n < e.dl_states.length; n++) {
 		let r = e.dl_states[n];
 		if (!Vn(r.state_name)) for (let n = 0; n < r.dl_actions.length; n++) {
@@ -670,7 +670,7 @@ function xe(e, t) {
 function De(e, t) {
 	"__json_config_variables__" !== t && gn(`GClass Attribute NOT FOUND: ${Ze(e)}, attr ${t}`);
 }
-function Ae(e, t, n) {
+function $e(e, t, n) {
 	let r = t;
 	(function(e, t, n, r, o) {
 		if (!e || !t) return gn("hsdata or kw NULL"), -1;
@@ -682,7 +682,7 @@ function Ae(e, t, n) {
 		return s;
 	})(ue(e), r, -1, e.gclass.gclass_flag & O.gcflag_ignore_unknown_attrs ? 0 : De, e) < 0 && (gn(`${Ze(e)} json2data() FAILED`), mn(r));
 }
-function $e(e, n, r, o, s) {
+function Ae(e, n, r, o, s) {
 	if (s & N.gobj_flag_yuno) {
 		if (d) return gn("__yuno__ already created"), null;
 		s |= N.gobj_flag_service;
@@ -708,10 +708,10 @@ function $e(e, n, r, o, s) {
 	_.jn_attrs = ie(_, i.attrs_table);
 	for (const [e, t] of Object.entries(_.jn_attrs)) e in _.priv && (_.priv[e] = t);
 	let a = K(_);
-	return a && I(t("💙💙⏩ creating: %s^%s", i.gclass_name, e)), _.gobj_flag & N.gobj_flag_service && Ne(_), _.gobj_flag & N.gobj_flag_yuno && (d = _), _.gobj_flag & N.gobj_flag_default_service && (b = _), _.gobj_flag & N.gobj_flag_yuno || we(o, _), _.obflag |= w.obflag_created, _.gclass.instances++, Ae(_, r), _.gobj_flag & N.gobj_flag_service && l && l(_, null), _.gclass.gmt.mt_create2 ? _.gclass.gmt.mt_create2(_, r) : _.gclass.gmt.mt_create && _.gclass.gmt.mt_create(_), o && o.gclass.gmt.mt_child_added && (a && I(t("👦👦🔵 child_added(%s): %s", et(o), Ze(_))), o.gclass.gmt.mt_child_added(o, _)), a && I(t("💙💙⏪ created: %s", et(_))), _;
+	return a && I(t("💙💙⏩ creating: %s^%s", i.gclass_name, e)), _.gobj_flag & N.gobj_flag_service && Ne(_), _.gobj_flag & N.gobj_flag_yuno && (d = _), _.gobj_flag & N.gobj_flag_default_service && (b = _), _.gobj_flag & N.gobj_flag_yuno || we(o, _), _.obflag |= w.obflag_created, _.gclass.instances++, $e(_, r), _.gobj_flag & N.gobj_flag_service && l && l(_, null), _.gclass.gmt.mt_create2 ? _.gclass.gmt.mt_create2(_, r) : _.gclass.gmt.mt_create && _.gclass.gmt.mt_create(_), o && o.gclass.gmt.mt_child_added && (a && I(t("👦👦🔵 child_added(%s): %s", et(o), Ze(_))), o.gclass.gmt.mt_child_added(o, _)), a && I(t("💙💙⏪ created: %s", et(_))), _;
 }
 function ke(e, t, n, r) {
-	return $e(e, t, n, r, N.gobj_flag_pure_child);
+	return Ae(e, t, n, r, N.gobj_flag_pure_child);
 }
 function Ie(e) {
 	if (ot(e)) return void gn("gobj NULL or DESTROYED");
@@ -1029,7 +1029,7 @@ function xt(e, n) {
 function Dt(e) {
 	return Gn(e) ? e.current_state.state_name : (gn("hgobj NULL"), "");
 }
-function At(e, t, n) {
+function $t(e, t, n) {
 	if (!Gn(e)) return gn("gobj NULL of bad type"), null;
 	let r = ye(e.gclass, t);
 	if (r) return r;
@@ -1042,12 +1042,12 @@ function At(e, t, n) {
 	}
 	return null;
 }
-function $t(e, t, n) {
-	let r = At(e, t, !1);
+function At(e, t, n) {
+	let r = $t(e, t, !1);
 	return !!r && !(n && !(r.event_flag & n));
 }
 function kt(e, t, n) {
-	let r = At(e, t, !1);
+	let r = $t(e, t, !1);
 	return !!r && !(n && !(r.event_flag & n)) && !!(r.event_flag & R.EVF_OUTPUT_EVENT);
 }
 var It = [], Ct = !1;
@@ -1101,21 +1101,21 @@ var Pt = Object.freeze({
 ];
 function Gt(e, t, n, r, o) {
 	let s = er(t, r, "__config__", null), l = er(t, r, "__global__", null), i = er(t, r, "__local__", null), _ = tr(t, r, "__filter__", null), a = !0;
-	if (t && t !== Zn(null, e, "publisher", null) && (a = !1), o && o !== Zn(null, e, "subscriber", null) && (a = !1), n && n !== Xn(null, e, "event", "") && (a = !1), $n(s) > 0) {
+	if (t && t !== Zn(null, e, "publisher", null) && (a = !1), o && o !== Zn(null, e, "subscriber", null) && (a = !1), n && n !== Xn(null, e, "event", "") && (a = !1), An(s) > 0) {
 		let t = er(null, e, "__config__", null);
-		$n(t) > 0 && En(t, s) || (a = !1);
+		An(t) > 0 && En(t, s) || (a = !1);
 	}
-	if ($n(l) > 0) {
+	if (An(l) > 0) {
 		let t = er(null, e, "__global__", null);
-		$n(t) > 0 && En(t, l) || (a = !1);
+		An(t) > 0 && En(t, l) || (a = !1);
 	}
-	if ($n(i) > 0) {
+	if (An(i) > 0) {
 		let t = er(null, e, "__local__", null);
-		$n(t) > 0 && En(t, i) || (a = !1);
+		An(t) > 0 && En(t, i) || (a = !1);
 	}
-	if ($n(_) > 0) {
+	if (An(_) > 0) {
 		let t = tr(null, e, "__filter__", null);
-		$n(t) > 0 && En(t, _) || (a = !1);
+		An(t) > 0 && En(t, _) || (a = !1);
 	}
 	return a;
 }
@@ -1153,14 +1153,14 @@ function Kt(e, n, r, o) {
 	}), Vn(n)) n = "";
 	else if (!(kt(e, n, R.EVF_OUTPUT_EVENT) || e.gclass.gclass_flag & O.gcflag_no_check_output_events)) return gn(`event NOT in output event list: ${Ze(e)}, ${n}`), 0;
 	let l = Vt(e.dl_subscriptions, e, n, r, o);
-	An(l) > 0 && (gn(`${Ze(e)}: ${An(l)} subscription(s) REPEATED, will be deleted and override`), mn(l, "subscription REPEATED"), Yt(e, l, !1));
+	$n(l) > 0 && (gn(`${Ze(e)}: ${$n(l)} subscription(s) REPEATED, will be deleted and override`), mn(l, "subscription REPEATED"), Yt(e, l, !1));
 	let i = function(e, t, n, r) {
 		let o = ie(e, Ft);
 		Nn(o, "event", t), Nn(o, "subscriber", r), Nn(o, "publisher", e);
 		let s = 0;
 		if (n) {
 			let t = er(e, n, "__config__", null), r = er(e, n, "__global__", null), l = er(e, n, "__local__", null), i = tr(e, n, "__filter__", null), _ = Xn(e, n, "__service__", "");
-			if ($n(r) > 0 && Nn(o, "__global__", hn(r)), $n(t) > 0) {
+			if (An(r) > 0 && Nn(o, "__global__", hn(r)), An(t) > 0) {
 				let n = hn(t);
 				if (Nn(o, "__config__", n), Jn(n, "__hard_subscription__")) {
 					let t = zn(e, n, "__hard_subscription__", !1);
@@ -1171,7 +1171,7 @@ function Kt(e, n, r, o) {
 					Sn(n, "__own_event__"), t && (s |= Pt.__own_event__);
 				}
 			}
-			$n(l) > 0 && Nn(o, "__local__", hn(l)), $n(i) > 0 && Nn(o, "__filter__", hn(i)), Vn(_) || Nn(o, "__service__", _);
+			An(l) > 0 && Nn(o, "__local__", hn(l)), An(i) > 0 && Nn(o, "__filter__", hn(i)), Vn(_) || Nn(o, "__service__", _);
 		}
 		return Nn(o, "subs_flag", s), o;
 	}(e, n, r, o);
@@ -1196,7 +1196,7 @@ function Jt(e, t, n, r) {
 function Ht(e, n, r) {
 	if (kn(r) || (r = {}), !e || e.obflag & (w.obflag_destroyed | w.obflag_destroying)) return gn("gobj NULL or DESTROYED"), -1;
 	if (Vn(n)) return gn(`${Ze(e)}: event EMPTY`), -1;
-	let o = At(e, n, !0);
+	let o = $t(e, n, !0);
 	if (!(o && o.event_flag & (R.EVF_SYSTEM_EVENT | R.EVF_OUTPUT_EVENT) || e.gclass.gclass_flag & O.gcflag_no_check_output_events)) return gn(`event NOT in output event list: ${Ze(e)}, ev ${n}`), -1;
 	let s = (Y(e) || H(e, n)) && !q(e, n);
 	if (s && (I(1 === k ? t("🔝🔝 %s %s%s %s", n || "", e.running ? "" : "!!", Ze(e), e.current_state.state_name) : t("🔝🔝 mach(%s%s^%s), st: %s, ev: %s%s%s", e.running ? "" : "!!", Xe(e), Qe(e), e.current_state.state_name, "", n || "", "")), J(e) && Dn(r) && mn(r)), e.gclass.gmt.mt_publish_event) {
@@ -1217,10 +1217,10 @@ function Ht(e, n, r) {
 		if (Vn(f) || 0 === Kn(f, n)) {
 			er(e, a, "__config__", null, 0);
 			let o = er(e, a, "__global__", null, 0), l = er(e, a, "__local__", null, 0), f = tr(e, a, "__filter__", null, 0), g = r, p = 1;
-			if (e.gclass.gmt.mt_publication_filter ? p = e.gclass.gmt.mt_publication_filter(e, n, g, u) : $n(f) > 0 && (p = sr(g, f) ? 1 : 0, s && (I(t("💜💜🔄%s publishing with filter, event '%s', subscriber'%s', publisher %s", p ? "👍" : "👎", n || "", Ze(u), Ze(e))), mn(f))), p < 0) break;
+			if (e.gclass.gmt.mt_publication_filter ? p = e.gclass.gmt.mt_publication_filter(e, n, g, u) : An(f) > 0 && (p = sr(g, f) ? 1 : 0, s && (I(t("💜💜🔄%s publishing with filter, event '%s', subscriber'%s', publisher %s", p ? "👍" : "👎", n || "", Ze(u), Ze(e))), mn(f))), p < 0) break;
 			if (!p) continue;
-			let d = At(u, n, !0);
-			if (d && d.event_flag & R.EVF_SYSTEM_EVENT && !$t(u, d.event_name, 0)) continue;
+			let d = $t(u, n, !0);
+			if (d && d.event_flag & R.EVF_SYSTEM_EVENT && !At(u, d.event_name, 0)) continue;
 			l && Bn(g, l), o && Tn(g, o), s && (I(1 === k ? t("🔝🔄 %s (%s) %s%s", n || "", n || "", u.running ? "" : "!!", Ze(u)) : t("🔝🔄 mach(%s%s), st: %s, ev: %s, from(%s%s)", u.running ? "" : "!!", Ze(u), Dt(u), n || "", e && !e.running ? "!!" : "", Ze(e))), J(e) && Dn(g) && mn(g));
 			let b = Ut(u, n, g, e);
 			if (b < 0 && c & Pt.__own_event__) {
@@ -1397,10 +1397,10 @@ function xn(e, t) {
 function Dn(e) {
 	return kn(e) ? Object.keys(e).length : 0;
 }
-function An(e) {
+function $n(e) {
 	return In(e) ? e.length : 0;
 }
-function $n(e) {
+function An(e) {
 	return kn(e) ? Object.keys(e).length : In(e) ? e.length : Cn(e) && e.length > 0 ? 1 : 0;
 }
 function kn(e) {
@@ -1461,13 +1461,17 @@ function Jn(e, t) {
 	return !(!(t in e) || !e.hasOwnProperty(t));
 }
 function Hn(e, t, n, r) {
-	if (e && !Gn(e) && gn("GObj bad instanceof"), !kn(t) && !In(t)) return gn(`${Ze(e)}: kw must be list or dict`), 0;
-	if (!Cn(n)) return gn(`${Ze(e)}: path must be a string: ${String(n)}`), 0;
-	let o = n.split("`");
-	if (o.length <= 1) return t[n];
-	let s = o.length;
-	for (let l = 0; l < s; l++) if (void 0 === (t = t[o[l]])) return void (r && gn(`${Ze(e)}: path not found: ${String(n)}`));
-	return t;
+	e && !Gn(e) && gn("GObj bad instanceof");
+	const o = e ? `${Ze(e)}: ` : "";
+	if (!kn(t) && !In(t)) return void gn(`${o}kw must be list or dict: '${String(n)}'`);
+	if (!Cn(n)) return void gn(`${o}path must be a string: ${String(n)}`);
+	let s = n.split("`"), l = s.length;
+	for (let e = 0; e < l - 1; e++) {
+		if (null == (t = t[s[e]])) return void (r && gn(`${o}path not found: '${n}'`));
+		if (!kn(t) && !In(t)) return void gn(`${o}kw must be list or dict: '${n}'`);
+	}
+	let i = t[s[l - 1]];
+	return void 0 === i && r && gn(`${o}path not found: '${n}'`), i;
 }
 function qn(e, t, n) {
 	e && !Gn(e) && gn("GObj bad instanceof");
@@ -1482,7 +1486,7 @@ function zn(e, t, n, r, o) {
 	let s = Hn(e, t, n, !1);
 	const l = o && o & qt.KW_REQUIRED, i = o && o & qt.KW_CREATE, _ = o && o & qt.KW_EXTRACT, a = o && o & qt.KW_WILD_NUMBER;
 	if (void 0 === s) {
-		if (i) {
+		if (i && t) {
 			let o = Boolean(r);
 			return nr(e, t, n, o), o;
 		}
@@ -1503,7 +1507,7 @@ function Qn(e, t, n, r, o) {
 	let s = Hn(e, t, n, !1);
 	const l = o && o & qt.KW_REQUIRED, i = o && o & qt.KW_CREATE, _ = o && o & qt.KW_EXTRACT, a = o && o & qt.KW_WILD_NUMBER;
 	if (void 0 === s) {
-		if (i) {
+		if (i && t) {
 			let o = parseInt(r);
 			return nr(e, t, n, o), o;
 		}
@@ -1531,7 +1535,7 @@ function Xn(e, t, n, r, o) {
 	e && !Gn(e) && gn("GObj bad instanceof");
 	let s = Hn(e, t, n, !1);
 	const l = o && o & qt.KW_REQUIRED, i = o && o & qt.KW_CREATE, _ = o && o & qt.KW_EXTRACT;
-	return void 0 === s ? i ? (nr(e, t, n, Cn(r) ? r : null), r) : (l && !function(e, t) {
+	return void 0 === s ? i && t ? (nr(e, t, n, Cn(r) ? r : null), r) : (l && !function(e, t) {
 		let n = Cn(t) ? t.split("`") : [], r = e;
 		for (let e = 0; e < n.length - 1; e++) {
 			if (!kn(r) && !In(r)) return !1;
@@ -1577,9 +1581,15 @@ function nr(e, t, n, r) {
 	let o = n.split("`");
 	if (o.length <= 1) return t[n] = r, 0;
 	let s = o.length;
-	for (let e = 0; e < s; e++) {
-		let n = o[e];
-		e === s - 1 ? t[n] = r : (void 0 === t[n] && (t[n] = {}), t = t[n]);
+	for (let l = 0; l < s; l++) {
+		let i = o[l];
+		if (l === s - 1) t[i] = r;
+		else {
+			let r = t[i];
+			if (void 0 === r) t[i] = {};
+			else if (!kn(r) && !In(r)) return gn(`${e ? Ze(e) + ": " : ""}kw_set_dict_value(): segment '${i}' is not a dict or a list: '${n}'`), -1;
+			t = t[i];
+		}
 	}
 	return 0;
 }
@@ -1619,7 +1629,7 @@ function or(e, n, r) {
 	return s;
 }
 function sr(e, t) {
-	return 0 === $n(t) || or(e, t, "");
+	return 0 === An(t) || or(e, t, "");
 }
 function lr(e, t, n, r) {
 	e && !Gn(e) && gn("GObj bad instanceof");
@@ -1629,7 +1639,7 @@ function lr(e, t, n, r) {
 		t.hasOwnProperty(s) ? o[s] = t[s] : r && gn(`${Ze(e)}: key not found: ${s}`);
 	} else if (kn(n) && Dn(n) > 0) for (let s of Object.keys(n)) t.hasOwnProperty(s) ? o[s] = t[s] : r && gn(`${Ze(e)}: key not found: ${s}`);
 	else {
-		if (!(In(n) && An(n) > 0)) return t;
+		if (!(In(n) && $n(n) > 0)) return t;
 		for (let s = 0; s < n.length; s++) {
 			let l = n[s];
 			t.hasOwnProperty(l) ? o[l] = t[l] : r && gn(`${Ze(e)}: key not found: ${l}`);
@@ -1644,7 +1654,7 @@ function ir(e, t, n, r) {
 		tr(e, t, s, 0, 0) ? Sn(o, s) : r && gn(`${Ze(e)}: key not found: ${s}`);
 	} else if (kn(n) && Dn(n) > 0) for (let s of Object.keys(n)) t.hasOwnProperty(s) ? Sn(o, s) : r && gn(`${Ze(e)}: key not found: ${s}`);
 	else {
-		if (!(In(n) && An(n) > 0)) return {};
+		if (!(In(n) && $n(n) > 0)) return {};
 		for (let s = 0; s < n.length; s++) {
 			let l = n[s];
 			t.hasOwnProperty(l) ? Sn(o, l) : r && gn(`${Ze(e)}: key not found: ${l}`);
@@ -1846,8 +1856,8 @@ function xr(e) {
 	let t = null;
 	return "function" != typeof e && "object" != typeof e || (t = ("" + e).match(/function\s*([\w\$]*)\s*\(/)), null !== t ? t[1] + "()" : "";
 }
-var Dr = 256, Ar = 1e5;
-function $r(e) {
+var Dr = 256, $r = 1e5;
+function Ar(e) {
 	const t = String(e).replace(/`/g, "``");
 	return "[" === t[0] ? "[" + t : t;
 }
@@ -2402,7 +2412,7 @@ function jo(e, t, n, r) {
 	}
 	let l = s.event, i = s.kw;
 	if ("ST_SESSION" !== Dt(e)) {
-		if ($t(e, l, R.EVF_PUBLIC_EVENT)) {
+		if (At(e, l, R.EVF_PUBLIC_EVENT)) {
 			if (!(Ut(e, l, i, e) < 0)) return 0;
 		} else gn(`${Ze(e)}: event UNKNOWN in not-session state ${l}`);
 		return uo(e), -1;
@@ -2413,10 +2423,10 @@ function jo(e, t, n, r) {
 	let c = Xn(e, a, "dst_service", "");
 	if ("__subscribing__" === _) return -1;
 	if ("__unsubscribing__" === _) return -1;
-	if ($t(e, l, R.EVF_PUBLIC_EVENT)) return Ut(e, l, i, e), 0;
+	if (At(e, l, R.EVF_PUBLIC_EVENT)) return Ut(e, l, i, e), 0;
 	if (!Vn(c)) {
 		let t = Oe(c, !1);
-		return t ? $t(t, l, R.EVF_PUBLIC_EVENT) ? (Ut(t, l, i, e), 0) : (gn(`${Ze(e)}: Service found but no event or not public, service '${Ze(t)}', ev '${l}'`), -1) : (pn(`${Ze(e)}: event for a service that is gone, DROPPED: service '${c}', ev '${l}'`), 0);
+		return t ? At(t, l, R.EVF_PUBLIC_EVENT) ? (Ut(t, l, i, e), 0) : (gn(`${Ze(e)}: Service found but no event or not public, service '${Ze(t)}', ev '${l}'`), -1) : (pn(`${Ze(e)}: event for a service that is gone, DROPPED: service '${c}', ev '${l}'`), 0);
 	}
 	return rt(e) ? Ut(tt(e), l, i, e) : Ht(e, l, i), 0;
 }
@@ -2578,7 +2588,7 @@ exports.GObj = S, exports.SDATA = v, exports.SDATAAUTHZ = (e, t, n, r, o, s) =>
 	}
 	return t;
 }, exports.empty_json = function(e) {
-	return 0 === $n(e);
+	return 0 === An(e);
 }, exports.empty_string = Vn, exports.escapeHtml = Sr, exports.event_flag_t = R, exports.flat2json = function(e) {
 	if (null === e || "object" != typeof e || Array.isArray(e)) throw new Error("flat2json: a flat json is an object of id -> value");
 	let t = null;
@@ -2592,7 +2602,7 @@ exports.GObj = S, exports.SDATA = v, exports.SDATAAUTHZ = (e, t, n, r, o, s) =>
 		let s = t;
 		for (let t = 0; t < r.length; t++) {
 			const o = r[t], l = "number" == typeof o, i = t === r.length - 1, _ = !i && "number" == typeof r[t + 1];
-			if (l && o > Ar) throw new Error(`flat2json: array index ${o} over the limit (100000) in '${n}'`);
+			if (l && o > $r) throw new Error(`flat2json: array index ${o} over the limit (100000) in '${n}'`);
 			if (l !== Array.isArray(s)) throw new Error(`flat2json: '${n}' uses a ${l ? "array index" : "key"} where the tree already has a ${Array.isArray(s) ? "array" : "object"}`);
 			if (i) {
 				if (Array.isArray(s)) {
@@ -2639,7 +2649,7 @@ exports.GObj = S, exports.SDATA = v, exports.SDATAAUTHZ = (e, t, n, r, o, s) =>
 	for (const e of Object.keys(r)) Object.prototype.hasOwnProperty.call(n, e) || (o.added[e] = r[e]);
 	return o;
 }, exports.flat_key_join = function(e) {
-	return Array.isArray(e) && 0 !== e.length ? e.map((e) => "number" == typeof e ? `[${e}]` : $r(e)).join("`") : "";
+	return Array.isArray(e) && 0 !== e.length ? e.map((e) => "number" == typeof e ? `[${e}]` : Ar(e)).join("`") : "";
 }, exports.flat_key_split = kr, exports.gclass_add_ev_action = he, exports.gclass_add_event_type = Te, exports.gclass_add_state = me, exports.gclass_check_fsm = ve, exports.gclass_create = ge, exports.gclass_event_type = ye, exports.gclass_find_by_name = je, exports.gclass_flag_t = O, exports.gclass_unregister = pe, exports.getPositionRelativeToBody = function(e) {
 	if (!e) return {
 		top: 0,
@@ -2668,15 +2678,15 @@ exports.GObj = S, exports.SDATA = v, exports.SDATAAUTHZ = (e, t, n, r, o, s) =>
 		return F > 1 || !!e && !!(M(e) & C.TRACE_COMMANDS);
 	}(e) || H(e, null) && !q(s, null)) && (I(t("🌀🌀 mach(%s%s), cmd: %s, src: %s", We(e) ? "" : "!!", Ze(e), n, Ze(s))), J(e) && mn(o)), e.gclass.gmt.mt_command_parser ? e.gclass.gmt.mt_command_parser(e, n, o, s) : e.gclass.command_table ? u ? u(e, n, o, s) : r(0, -1, t("%s: global command parser not available", Ze(e)), 0, 0) : r(0, -1, t("%s: command table not available", Ze(e)), 0, 0));
 }, exports.gobj_create = function(e, t, n, r) {
-	return $e(e, t, n, r, 0);
-}, exports.gobj_create2 = $e, exports.gobj_create_default_service = function(e, t, n, r) {
-	return $e(e, t, n, r, N.gobj_flag_default_service | N.gobj_flag_autostart);
+	return Ae(e, t, n, r, 0);
+}, exports.gobj_create2 = Ae, exports.gobj_create_default_service = function(e, t, n, r) {
+	return Ae(e, t, n, r, N.gobj_flag_default_service | N.gobj_flag_autostart);
 }, exports.gobj_create_pure_child = ke, exports.gobj_create_service = function(e, t, n, r) {
-	return $e(e, t, n, r, N.gobj_flag_service);
+	return Ae(e, t, n, r, N.gobj_flag_service);
 }, exports.gobj_create_volatil = function(e, t, n, r) {
-	return $e(e, t, n, r, N.gobj_flag_volatil);
+	return Ae(e, t, n, r, N.gobj_flag_volatil);
 }, exports.gobj_create_yuno = function(e, t, n) {
-	return $e(e, t, n, null, N.gobj_flag_yuno);
+	return Ae(e, t, n, null, N.gobj_flag_yuno);
 }, exports.gobj_current_state = Dt, exports.gobj_default_service = Se, exports.gobj_deliver_posted_events = Lt, exports.gobj_destroy = Ie, exports.gobj_find_child = dt, exports.gobj_find_gobj = function(e, t) {
 	if (Vn(t)) return null;
 	const n = t.toLowerCase();
@@ -2685,7 +2695,7 @@ exports.GObj = S, exports.SDATA = v, exports.SDATAAUTHZ = (e, t, n, r, o, s) =>
 	return U;
 }, exports.gobj_global_trace_no_level = function() {
 	return P;
-}, exports.gobj_has_attr = mt, exports.gobj_has_event = $t, exports.gobj_has_output_event = kt, exports.gobj_hsdata = ue, exports.gobj_is_destroying = ot, exports.gobj_is_playing = Be, exports.gobj_is_pure_child = rt, exports.gobj_is_running = We, exports.gobj_is_service = Ye, exports.gobj_is_volatil = nt, exports.gobj_list_persistent_attrs = function(e, t) {
+}, exports.gobj_has_attr = mt, exports.gobj_has_event = At, exports.gobj_has_output_event = kt, exports.gobj_hsdata = ue, exports.gobj_is_destroying = ot, exports.gobj_is_playing = Be, exports.gobj_is_pure_child = rt, exports.gobj_is_running = We, exports.gobj_is_service = Ye, exports.gobj_is_volatil = nt, exports.gobj_list_persistent_attrs = function(e, t) {
 	return a ? a(e, t) : null;
 }, exports.gobj_list_subscriptions = function(e) {
 	let t = Bt(e, null, null, null);
@@ -2701,8 +2711,8 @@ exports.GObj = S, exports.SDATA = v, exports.SDATAAUTHZ = (e, t, n, r, o, s) =>
 	return {
 		subscriptions: t,
 		subscribings: n,
-		"total subscriptions": An(t),
-		total_subscribings: An(n)
+		"total subscriptions": $n(t),
+		total_subscribings: $n(n)
 	};
 }, exports.gobj_load_persistent_attrs = function(e, t) {
 	return Ye(e) ? l ? l(e, t) : -1 : (gn(`${Ze(e)}: Only gobj services can load/save writable-persistent`), -1);
@@ -2727,7 +2737,7 @@ exports.GObj = S, exports.SDATA = v, exports.SDATAAUTHZ = (e, t, n, r, o, s) =>
 		}
 	}(n, e), n;
 }, exports.gobj_match_gobj = pt, exports.gobj_name = Qe, exports.gobj_parent = tt, exports.gobj_pause = Me, exports.gobj_play = Ve, exports.gobj_post_event = function(e, n, r, o) {
-	return e && e instanceof S ? e.obflag & (w.obflag_destroyed | w.obflag_destroying) ? (gn(`gobj_post_event(): gobj dst DESTROYING, event ${n}`), -1) : Vn(n) ? (gn("gobj_post_event(): event EMPTY"), -1) : $t(e, n, 0) ? It.length >= 1e4 ? (gn(`gobj_post_event(): too many posted events, this is NOT a work queue, event ${n}, pending ${It.length}`), -1) : (It.push({
+	return e && e instanceof S ? e.obflag & (w.obflag_destroyed | w.obflag_destroying) ? (gn(`gobj_post_event(): gobj dst DESTROYING, event ${n}`), -1) : Vn(n) ? (gn("gobj_post_event(): event EMPTY"), -1) : At(e, n, 0) ? It.length >= 1e4 ? (gn(`gobj_post_event(): too many posted events, this is NOT a work queue, event ${n}, pending ${It.length}`), -1) : (It.push({
 		dst: e,
 		event: n,
 		kw: r,
@@ -2885,7 +2895,7 @@ exports.GObj = S, exports.SDATA = v, exports.SDATAAUTHZ = (e, t, n, r, o, s) =>
 			const t = Object.keys(e);
 			if (t.length > 0) {
 				for (const s of t) {
-					const t = $r(s);
+					const t = Ar(s);
 					n(e[s], 0 === o ? t : r + "`" + t, o + 1);
 				}
 				return;
@@ -2896,7 +2906,7 @@ exports.GObj = S, exports.SDATA = v, exports.SDATAAUTHZ = (e, t, n, r, o, s) =>
 	return null == e || n(e, "", 0), t;
 }, exports.json_array_append = wn, exports.json_array_append_new = Rn, exports.json_array_extend = function(e, t) {
 	return t ? (Array.prototype.push.apply(e, t), e) : e;
-}, exports.json_array_remove = xn, exports.json_array_size = An, exports.json_deep_copy = hn, exports.json_is_identical = En, exports.json_object_del = Sn, exports.json_object_get = jn, exports.json_object_set = On, exports.json_object_set_new = Nn, exports.json_object_size = Dn, exports.json_object_update = Tn, exports.json_object_update_existing = yn, exports.json_object_update_missing = vn, exports.json_size = $n, exports.jwt2json = function(e, t) {
+}, exports.json_array_remove = xn, exports.json_array_size = $n, exports.json_deep_copy = hn, exports.json_is_identical = En, exports.json_object_del = Sn, exports.json_object_get = jn, exports.json_object_set = On, exports.json_object_set_new = Nn, exports.json_object_size = Dn, exports.json_object_update = Tn, exports.json_object_update_existing = yn, exports.json_object_update_missing = vn, exports.json_size = An, exports.jwt2json = function(e, t) {
 	try {
 		let n = jr(e);
 		switch (t) {
@@ -2934,7 +2944,7 @@ exports.GObj = S, exports.SDATA = v, exports.SDATAAUTHZ = (e, t, n, r, o, s) =>
 	let s = Hn(e, t, n, !1);
 	const l = o && o & qt.KW_REQUIRED, i = o && o & qt.KW_CREATE, _ = o && o & qt.KW_EXTRACT, a = o && o & qt.KW_WILD_NUMBER;
 	if (void 0 === s) {
-		if (i) {
+		if (i && t) {
 			let o = Number(r);
 			return nr(e, t, n, o), o;
 		}
@@ -3016,7 +3026,7 @@ exports.GObj = S, exports.SDATA = v, exports.SDATAAUTHZ = (e, t, n, r, o, s) =>
 			let e = {};
 			if (Jn(s, t)) {
 				if (!Jn(s, n)) {
-					if (!($n(s) > 0)) {
+					if (!(An(s) > 0)) {
 						gn("list2options(): object without field value: " + n);
 						continue;
 					}
@@ -3024,7 +3034,7 @@ exports.GObj = S, exports.SDATA = v, exports.SDATAAUTHZ = (e, t, n, r, o, s) =>
 				}
 				e.id = s[t], e.value = s[n];
 			} else {
-				if (!($n(s) > 0)) {
+				if (!(An(s) > 0)) {
 					gn("list2options(): object without field id: " + t);
 					continue;
 				}
@@ -3308,11 +3318,11 @@ exports.GObj = S, exports.SDATA = v, exports.SDATAAUTHZ = (e, t, n, r, o, s) =>
 	let n = Lr(e, t);
 	return n ? n.topic_name + "^" + n.id + "^" + n.hook_name : null;
 }, exports.treedb_get_field_desc = Gr, exports.treedb_hook_data_size = function(e) {
-	if (In(e) && 1 === $n(e)) {
+	if (In(e) && 1 === An(e)) {
 		let t = e[0];
 		return Jn(t, "size") ? t.size : 1;
 	}
-	return $n(e);
+	return An(e);
 }, exports.vsprintf = function(e, n) {
 	return t.apply(null, [e].concat(n || []));
 }, exports.walk_type_t = x;