@yuneta/gobj-js 7.26.0 → 7.26.1

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

@@ -506,10 +506,13 @@ function ae(e, t, n, r) {
 			if (!Qn(o)) return bn(`attr must be an object: ${n.name}`), -1;
 			break;
 		case h.DTP_JSON:
-			if (o = r, Zn(r)) try {
-				o = JSON.parse(r);
-			} catch (e) {
-				o = r;
+			if (o = r, Zn(r)) {
+				const e = r.trim();
+				if (e.startsWith("{") || e.startsWith("[")) try {
+					o = JSON.parse(e);
+				} catch (e) {
+					o = r;
+				}
 			}
 			break;
 		case h.DTP_POINTER: o = r;
@@ -1094,7 +1097,7 @@ function Pt(e, n, r, o) {
 		i.action && (_ = i.action(e, n, r, o));
 	} catch (t) {
 		if (m--, !t || !t.__gobj_logged__) {
-			bn(`${Ze(e)}: action of ${n} in ${e.current_state.state_name} THREW: ${t && t.stack ? t.stack : t}`);
+			bn(`${Ze(e)}: action of ${n} in ${s.state_name} THREW: ${t && t.stack ? t.stack : t}`);
 			try {
 				t.__gobj_logged__ = !0;
 			} catch (e) {}
@@ -1562,7 +1565,7 @@ function An(e, t, n, r) {
 			}
 			r.left -= 1 + _.length;
 			let a, u = e[_];
-			a = (On(_.slice(-128)) || o && "value" === _) && null != u && "" !== u ? "********" : An(u, t, n + 1, r), a !== u && (l = !0), s[_] = a;
+			a = (On(_.slice(-128)) || o && "value" === _) && null != u && "" !== u ? "********" : An(u, t, n + 1, r), a !== u && (l = !0), gr(s, _, a);
 		}
 		i && (s["<more>"] = Rn);
 	}
@@ -1604,30 +1607,30 @@ function Pn(e, t) {
 }
 function Un(e, t) {
 	if (!t) return e;
-	for (let n of Object.keys(t)) e[n] = t[n];
+	for (let n of Object.keys(t)) gr(e, n, t[n]);
 	return e;
 }
 function Fn(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) && gr(e, n, t[n]);
 	return e;
 }
 function Vn(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) && gr(e, n, t[n]);
 	return e;
 }
 function Gn(e, t) {
-	if (e && e.hasOwnProperty(t)) return e[t];
+	if (e && Object.prototype.hasOwnProperty.call(e, t)) return e[t];
 }
 function Mn(e, t) {
-	e && e.hasOwnProperty(t) && delete e[t];
+	e && Object.prototype.hasOwnProperty.call(e, t) && delete e[t];
 }
 function Wn(e, t, n) {
-	e[t] = n;
+	gr(e, t, n);
 }
 function Kn(e, t, n) {
-	e[t] = n;
+	gr(e, t, n);
 }
 function Yn(e, t) {
 	e.push(t);
@@ -1702,10 +1705,10 @@ function ur(e, t) {
 	else for (const n of Object.keys(t)) delete e[n];
 }
 function cr(e, t) {
-	return !(!(t in e) || !e.hasOwnProperty(t));
+	return !(!(t in e) || !Object.prototype.hasOwnProperty.call(e, t));
 }
 function fr(e, t) {
-	return ("__proto__" === t || "constructor" === t || "prototype" === t) && !Object.prototype.hasOwnProperty.call(e, t);
+	return !Object.prototype.hasOwnProperty.call(e, t);
 }
 function gr(e, t, n) {
 	"__proto__" === t ? Object.defineProperty(e, t, {
@@ -1891,13 +1894,13 @@ function wr(e, t, n, r) {
 	let o = {};
 	if (Zn(n) && !sr(n)) {
 		let s = n;
-		t.hasOwnProperty(s) ? o[s] = t[s] : r && bn(`${Ze(e)}: key not found: ${s}`);
-	} else if (Qn(n) && qn(n) > 0) for (let s of Object.keys(n)) t.hasOwnProperty(s) ? o[s] = t[s] : r && bn(`${Ze(e)}: key not found: ${s}`);
+		Object.prototype.hasOwnProperty.call(t, s) ? gr(o, s, t[s]) : r && bn(`${Ze(e)}: key not found: ${s}`);
+	} else if (Qn(n) && qn(n) > 0) for (let s of Object.keys(n)) Object.prototype.hasOwnProperty.call(t, s) ? gr(o, s, t[s]) : r && bn(`${Ze(e)}: key not found: ${s}`);
 	else {
 		if (!(Xn(n) && Hn(n) > 0)) return t;
 		for (let s = 0; s < n.length; s++) {
 			let l = n[s];
-			t.hasOwnProperty(l) ? o[l] = t[l] : r && bn(`${Ze(e)}: key not found: ${l}`);
+			Object.prototype.hasOwnProperty.call(t, l) ? gr(o, l, t[l]) : r && bn(`${Ze(e)}: key not found: ${l}`);
 		}
 	}
 	return o;
@@ -1907,13 +1910,13 @@ function Nr(e, t, n, r) {
 	if (!Qn(t)) return o;
 	if (Un(o, t), Zn(n) && !sr(n)) {
 		let s = n;
-		t.hasOwnProperty(s) ? Mn(o, s) : r && bn(`${Ze(e)}: key not found: ${s}`);
-	} else if (Qn(n) && qn(n) > 0) for (let s of Object.keys(n)) t.hasOwnProperty(s) ? Mn(o, s) : r && bn(`${Ze(e)}: key not found: ${s}`);
+		Object.prototype.hasOwnProperty.call(t, s) ? Mn(o, s) : r && bn(`${Ze(e)}: key not found: ${s}`);
+	} else if (Qn(n) && qn(n) > 0) for (let s of Object.keys(n)) Object.prototype.hasOwnProperty.call(t, s) ? Mn(o, s) : r && bn(`${Ze(e)}: key not found: ${s}`);
 	else {
 		if (!(Xn(n) && Hn(n) > 0)) return {};
 		for (let s = 0; s < n.length; s++) {
 			let l = n[s];
-			t.hasOwnProperty(l) ? Mn(o, l) : r && bn(`${Ze(e)}: key not found: ${l}`);
+			Object.prototype.hasOwnProperty.call(t, l) ? Mn(o, l) : r && bn(`${Ze(e)}: key not found: ${l}`);
 		}
 	}
 	return o;
@@ -2031,7 +2034,7 @@ function Vr(e, t) {
 function Gr(e, t, n) {
 	void 0 !== n && Zn(n) || (n = "");
 	for (let r of Object.keys(e)) {
-		if (!e.hasOwnProperty(r)) continue;
+		if (!Object.prototype.hasOwnProperty.call(e, r)) continue;
 		let o = (n.length ? "`" : "") + r;
 		n += o, t.apply(this, [
 			e,
@@ -2470,34 +2473,33 @@ var Ro = {
 function Do(e) {
 	e.priv.websocket && bn("Websocket ALREADY setup");
 	const t = vt(e, "url");
-	let n;
 	hn(`====> Starting WebSocket to '${t}' (${Ze(e)})`);
+	const n = ++e.priv.ws_seq;
+	let r;
 	try {
-		n = new WebSocket(t);
+		r = new WebSocket(t);
 	} catch (n) {
 		return bn(`${Ze(e)}: Cannot open WebSocket to '${t}', Error: ${n.message}`), null;
 	}
-	if (!n) return bn(`${Ze(e)}: Failed to initialize WebSocket.`), null;
-	const r = ++e.priv.ws_seq;
-	return n.onopen = () => {
-		r !== e.priv.ws_seq || ot(e) || Pt(e, "EV_ON_OPEN", {
+	return r ? (r.onopen = () => {
+		n !== e.priv.ws_seq || ot(e) || Pt(e, "EV_ON_OPEN", {
 			url: t,
-			ws_seq: r
+			ws_seq: n
 		}, e);
-	}, n.onmessage = (n) => {
-		r !== e.priv.ws_seq || ot(e) || Pt(e, "EV_ON_MESSAGE", {
+	}, r.onmessage = (r) => {
+		n !== e.priv.ws_seq || ot(e) || Pt(e, "EV_ON_MESSAGE", {
 			url: t,
-			data: n.data
+			data: r.data
 		}, e);
-	}, n.onclose = (n) => {
-		ot(e) || r === e.priv.ws_seq && (yt(Je(), "browser_beforeunload") ? mn("Close websocket by unload page") : Pt(e, "EV_ON_CLOSE", {
+	}, r.onclose = (r) => {
+		ot(e) || n === e.priv.ws_seq && (yt(Je(), "browser_beforeunload") ? mn("Close websocket by unload page") : Pt(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) : (bn(`${Ze(e)}: Failed to initialize WebSocket.`), null);
 }
 function $o(e, t = 1e3, n = "") {
 	let r = e.priv, o = r.websocket;
@@ -2901,11 +2903,11 @@ exports.GObj = O, exports.SDATA = v, exports.SDATAAUTHZ = (e, t, n, r, o, s) =>
 	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 || {})) gr(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;
+		gr(e, n, r.to);
 	}
 	return e;
 }, exports.flat_diff = function(e, t) {
@@ -3175,7 +3177,7 @@ exports.GObj = O, exports.SDATA = v, exports.SDATAAUTHZ = (e, t, n, r, o, s) =>
 				return;
 			}
 		}
-		0 !== o && (t[r] = e);
+		0 !== o && gr(t, r, e);
 	};
 	return null == e || n(e, "", 0), t;
 }, exports.json_array_append = Yn, exports.json_array_append_new = Bn, exports.json_array_extend = function(e, t) {
@@ -3257,7 +3259,7 @@ exports.GObj = O, exports.SDATA = v, exports.SDATAAUTHZ = (e, t, n, r, o, s) =>
 	if (e && !or(e) && bn("GObj bad instanceof"), !t) return [];
 	let n = [];
 	if (Zn(t)) n.push(t);
-	else if (Qn(t)) for (let e in t) t.hasOwnProperty(e) && n.push(e);
+	else if (Qn(t)) for (let e in t) Object.prototype.hasOwnProperty.call(t, e) && n.push(e);
 	else Xn(t) && t.forEach(function(t) {
 		if (Zn(t)) sr(t) || n.push(t);
 		else if (Qn(t)) {