@yuneta/gobj-js 7.26.0 → 7.26.1

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

@@ -509,10 +509,13 @@
 				if (!Xn(l)) return mn(`attr must be an object: ${n.name}`), -1;
 				break;
 			case E.DTP_JSON:
-				if (l = r, er(r)) try {
-					l = JSON.parse(r);
-				} catch (e) {
-					l = r;
+				if (l = r, er(r)) {
+					const e = r.trim();
+					if (e.startsWith("{") || e.startsWith("[")) try {
+						l = JSON.parse(e);
+					} catch (e) {
+						l = r;
+					}
 				}
 				break;
 			case E.DTP_POINTER: l = r;
@@ -1097,7 +1100,7 @@
 			i.action && (_ = i.action(e, t, r, l));
 		} catch (n) {
 			if (h--, !n || !n.__gobj_logged__) {
-				mn(`${et(e)}: action of ${t} in ${e.current_state.state_name} THREW: ${n && n.stack ? n.stack : n}`);
+				mn(`${et(e)}: action of ${t} in ${o.state_name} THREW: ${n && n.stack ? n.stack : n}`);
 				try {
 					n.__gobj_logged__ = !0;
 				} catch (e) {}
@@ -1565,7 +1568,7 @@
 				}
 				r.left -= 1 + _.length;
 				let a, u = e[_];
-				a = (Sn(_.slice(-128)) || l && "value" === _) && null != u && "" !== u ? "********" : Cn(u, t, n + 1, r), a !== u && (s = !0), o[_] = a;
+				a = (Sn(_.slice(-128)) || l && "value" === _) && null != u && "" !== u ? "********" : Cn(u, t, n + 1, r), a !== u && (s = !0), dr(o, _, a);
 			}
 			i && (o["<more>"] = Dn);
 		}
@@ -1607,30 +1610,30 @@
 	}
 	function Vn(e, t) {
 		if (!t) return e;
-		for (let n of Object.keys(t)) e[n] = t[n];
+		for (let n of Object.keys(t)) dr(e, n, t[n]);
 		return e;
 	}
 	function Gn(e, t) {
 		if (!t) return e;
-		for (let n in t) t.hasOwnProperty(n) && e.hasOwnProperty(n) && (e[n] = t[n]);
+		for (let n in t) Object.prototype.hasOwnProperty.call(t, n) && Object.prototype.hasOwnProperty.call(e, n) && dr(e, n, t[n]);
 		return e;
 	}
 	function Mn(e, t) {
 		if (!t) return e;
-		for (let n in t) t.hasOwnProperty(n) && !e.hasOwnProperty(n) && (e[n] = t[n]);
+		for (let n in t) Object.prototype.hasOwnProperty.call(t, n) && !Object.prototype.hasOwnProperty.call(e, n) && dr(e, n, t[n]);
 		return e;
 	}
 	function Wn(e, t) {
-		if (e && e.hasOwnProperty(t)) return e[t];
+		if (e && Object.prototype.hasOwnProperty.call(e, t)) return e[t];
 	}
 	function xn(e, t) {
-		e && e.hasOwnProperty(t) && delete e[t];
+		e && Object.prototype.hasOwnProperty.call(e, t) && delete e[t];
 	}
 	function Kn(e, t, n) {
-		e[t] = n;
+		dr(e, t, n);
 	}
 	function Yn(e, t, n) {
-		e[t] = n;
+		dr(e, t, n);
 	}
 	function Bn(e, t) {
 		e.push(t);
@@ -1705,10 +1708,10 @@
 		else for (const n of Object.keys(t)) delete e[n];
 	}
 	function fr(e, t) {
-		return !(!(t in e) || !e.hasOwnProperty(t));
+		return !(!(t in e) || !Object.prototype.hasOwnProperty.call(e, t));
 	}
 	function gr(e, t) {
-		return ("__proto__" === t || "constructor" === t || "prototype" === t) && !Object.prototype.hasOwnProperty.call(e, t);
+		return !Object.prototype.hasOwnProperty.call(e, t);
 	}
 	function dr(e, t, n) {
 		"__proto__" === t ? Object.defineProperty(e, t, {
@@ -1894,13 +1897,13 @@
 		let l = {};
 		if (er(n) && !sr(n)) {
 			let o = n;
-			t.hasOwnProperty(o) ? l[o] = t[o] : r && mn(`${et(e)}: key not found: ${o}`);
-		} else if (Xn(n) && Hn(n) > 0) for (let o of Object.keys(n)) t.hasOwnProperty(o) ? l[o] = t[o] : r && mn(`${et(e)}: key not found: ${o}`);
+			Object.prototype.hasOwnProperty.call(t, o) ? dr(l, o, t[o]) : r && mn(`${et(e)}: key not found: ${o}`);
+		} else if (Xn(n) && Hn(n) > 0) for (let o of Object.keys(n)) Object.prototype.hasOwnProperty.call(t, o) ? dr(l, o, t[o]) : r && mn(`${et(e)}: key not found: ${o}`);
 		else {
 			if (!(Zn(n) && zn(n) > 0)) return t;
 			for (let o = 0; o < n.length; o++) {
 				let s = n[o];
-				t.hasOwnProperty(s) ? l[s] = t[s] : r && mn(`${et(e)}: key not found: ${s}`);
+				Object.prototype.hasOwnProperty.call(t, s) ? dr(l, s, t[s]) : r && mn(`${et(e)}: key not found: ${s}`);
 			}
 		}
 		return l;
@@ -1910,13 +1913,13 @@
 		if (!Xn(t)) return l;
 		if (Vn(l, t), er(n) && !sr(n)) {
 			let o = n;
-			t.hasOwnProperty(o) ? xn(l, o) : r && mn(`${et(e)}: key not found: ${o}`);
-		} else if (Xn(n) && Hn(n) > 0) for (let o of Object.keys(n)) t.hasOwnProperty(o) ? xn(l, o) : r && mn(`${et(e)}: key not found: ${o}`);
+			Object.prototype.hasOwnProperty.call(t, o) ? xn(l, o) : r && mn(`${et(e)}: key not found: ${o}`);
+		} else if (Xn(n) && Hn(n) > 0) for (let o of Object.keys(n)) Object.prototype.hasOwnProperty.call(t, o) ? xn(l, o) : r && mn(`${et(e)}: key not found: ${o}`);
 		else {
 			if (!(Zn(n) && zn(n) > 0)) return {};
 			for (let o = 0; o < n.length; o++) {
 				let s = n[o];
-				t.hasOwnProperty(s) ? xn(l, s) : r && mn(`${et(e)}: key not found: ${s}`);
+				Object.prototype.hasOwnProperty.call(t, s) ? xn(l, s) : r && mn(`${et(e)}: key not found: ${s}`);
 			}
 		}
 		return l;
@@ -2034,7 +2037,7 @@
 	function Wr(e, t, n) {
 		void 0 !== n && er(n) || (n = "");
 		for (let r of Object.keys(e)) {
-			if (!e.hasOwnProperty(r)) continue;
+			if (!Object.prototype.hasOwnProperty.call(e, r)) continue;
 			let l = (n.length ? "`" : "") + r;
 			n += l, t.apply(this, [
 				e,
@@ -2473,34 +2476,33 @@
 	function $l(e) {
 		e.priv.websocket && mn("Websocket ALREADY setup");
 		const t = jt(e, "url");
-		let n;
 		En(`====> Starting WebSocket to '${t}' (${et(e)})`);
+		const n = ++e.priv.ws_seq;
+		let r;
 		try {
-			n = new WebSocket(t);
+			r = new WebSocket(t);
 		} catch (n) {
 			return mn(`${et(e)}: Cannot open WebSocket to '${t}', Error: ${n.message}`), null;
 		}
-		if (!n) return mn(`${et(e)}: Failed to initialize WebSocket.`), null;
-		const r = ++e.priv.ws_seq;
-		return n.onopen = () => {
-			r !== e.priv.ws_seq || ot(e) || Ft(e, "EV_ON_OPEN", {
+		return r ? (r.onopen = () => {
+			n !== e.priv.ws_seq || ot(e) || Ft(e, "EV_ON_OPEN", {
 				url: t,
-				ws_seq: r
+				ws_seq: n
 			}, e);
-		}, n.onmessage = (n) => {
-			r !== e.priv.ws_seq || ot(e) || Ft(e, "EV_ON_MESSAGE", {
+		}, r.onmessage = (r) => {
+			n !== e.priv.ws_seq || ot(e) || Ft(e, "EV_ON_MESSAGE", {
 				url: t,
-				data: n.data
+				data: r.data
 			}, e);
-		}, n.onclose = (n) => {
-			ot(e) || r === e.priv.ws_seq && (Tt(qe(), "browser_beforeunload") ? hn("Close websocket by unload page") : Ft(e, "EV_ON_CLOSE", {
+		}, r.onclose = (r) => {
+			ot(e) || n === e.priv.ws_seq && (Tt(qe(), "browser_beforeunload") ? hn("Close websocket by unload page") : Ft(e, "EV_ON_CLOSE", {
 				url: t,
-				ws_seq: r,
-				code: n.code,
-				reason: n.reason,
-				was_clean: n.wasClean
+				ws_seq: n,
+				code: r.code,
+				reason: r.reason,
+				was_clean: r.wasClean
 			}, e));
-		}, n;
+		}, r) : (mn(`${et(e)}: Failed to initialize WebSocket.`), null);
 	}
 	function kl(e, t = 1e3, n = "") {
 		let r = e.priv, l = r.websocket;
@@ -2904,11 +2906,11 @@
 		if (null === e || "object" != typeof e || Array.isArray(e)) throw new Error("flat_apply: a flat json is an object of id -> value");
 		if (null === t || "object" != typeof t) throw new Error("flat_apply: a diff is the object flat_diff() answers");
 		for (const n of Object.keys(t.removed || {})) delete e[n];
-		for (const n of Object.keys(t.added || {})) e[n] = t.added[n];
+		for (const n of Object.keys(t.added || {})) dr(e, n, t.added[n]);
 		for (const n of Object.keys(t.changed || {})) {
 			const r = t.changed[n];
 			if (!r || !Object.prototype.hasOwnProperty.call(r, "to")) throw new Error(`flat_apply: changed '${n}' without a 'to'`);
-			e[n] = r.to;
+			dr(e, n, r.to);
 		}
 		return e;
 	}, e.flat_diff = function(e, t) {
@@ -3178,7 +3180,7 @@
 					return;
 				}
 			}
-			0 !== l && (t[r] = e);
+			0 !== l && dr(t, r, e);
 		};
 		return null == e || n(e, "", 0), t;
 	}, e.json_array_append = Bn, e.json_array_append_new = Jn, e.json_array_extend = function(e, t) {
@@ -3260,7 +3262,7 @@
 		if (e && !or(e) && mn("GObj bad instanceof"), !t) return [];
 		let n = [];
 		if (er(t)) n.push(t);
-		else if (Xn(t)) for (let e in t) t.hasOwnProperty(e) && n.push(e);
+		else if (Xn(t)) for (let e in t) Object.prototype.hasOwnProperty.call(t, e) && n.push(e);
 		else Zn(t) && t.forEach(function(t) {
 			if (er(t)) sr(t) || n.push(t);
 			else if (Xn(t)) {