@yuneta/gobj-js 7.26.0 → 7.26.1

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

@@ -552,10 +552,13 @@ function je(e, t, n, r) {
 			if (!Yr(l)) return ir(`attr must be an object: ${n.name}`), -1;
 			break;
 		case y.DTP_JSON:
-			if (l = r, Jr(r)) try {
-				l = JSON.parse(r);
-			} catch (e) {
-				l = r;
+			if (l = r, Jr(r)) {
+				const e = r.trim();
+				if (e.startsWith("{") || e.startsWith("[")) try {
+					l = JSON.parse(e);
+				} catch (e) {
+					l = r;
+				}
 			}
 			break;
 		case y.DTP_POINTER: l = r;
@@ -1230,7 +1233,7 @@ function yn(e, n, r, l) {
 		s.action && (a = s.action(e, n, r, l));
 	} catch (t) {
 		if (T--, !t || !t.__gobj_logged__) {
-			ir(`${$t(e)}: action of ${n} in ${e.current_state.state_name} THREW: ${t && t.stack ? t.stack : t}`);
+			ir(`${$t(e)}: action of ${n} in ${o.state_name} THREW: ${t && t.stack ? t.stack : t}`);
 			try {
 				t.__gobj_logged__ = !0;
 			} catch (e) {}
@@ -1774,7 +1777,7 @@ function Sr(e, t, n, r) {
 			}
 			r.left -= 1 + a.length;
 			let u, _ = e[a];
-			u = (br(a.slice(-128)) || l && "value" === a) && null != _ && "" !== _ ? "********" : Sr(_, t, n + 1, r), u !== _ && (i = !0), o[a] = u;
+			u = (br(a.slice(-128)) || l && "value" === a) && null != _ && "" !== _ ? "********" : Sr(_, t, n + 1, r), u !== _ && (i = !0), gl(o, a, u);
 		}
 		s && (o["<more>"] = Er);
 	}
@@ -1824,30 +1827,30 @@ function $r(e, t) {
 }
 function Dr(e, t) {
 	if (!t) return e;
-	for (let n of Object.keys(t)) e[n] = t[n];
+	for (let n of Object.keys(t)) gl(e, n, t[n]);
 	return e;
 }
 function Ar(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) && gl(e, n, t[n]);
 	return e;
 }
 function Ir(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) && gl(e, n, t[n]);
 	return e;
 }
 function kr(e, t) {
-	if (e && e.hasOwnProperty(t)) return e[t];
+	if (e && Object.prototype.hasOwnProperty.call(e, t)) return e[t];
 }
 function Cr(e, t) {
-	e && e.hasOwnProperty(t) && delete e[t];
+	e && Object.prototype.hasOwnProperty.call(e, t) && delete e[t];
 }
 function Lr(e, t, n) {
-	e[t] = n;
+	gl(e, t, n);
 }
 function Pr(e, t, n) {
-	e[t] = n;
+	gl(e, t, n);
 }
 function Ur(e, t) {
 	e.push(t);
@@ -1957,10 +1960,10 @@ function _l(e, t) {
 	else for (const n of Object.keys(t)) delete e[n];
 }
 function cl(e, t) {
-	return !(!(t in e) || !e.hasOwnProperty(t));
+	return !(!(t in e) || !Object.prototype.hasOwnProperty.call(e, t));
 }
 function fl(e, t) {
-	return ("__proto__" === t || "constructor" === t || "prototype" === t) && !Object.prototype.hasOwnProperty.call(e, t);
+	return !Object.prototype.hasOwnProperty.call(e, t);
 }
 function gl(e, t, n) {
 	"__proto__" === t ? Object.defineProperty(e, t, {
@@ -2209,13 +2212,13 @@ function Al(e, t, n, r) {
 	let l = {};
 	if (Jr(n) && !tl(n)) {
 		let o = n;
-		t.hasOwnProperty(o) ? l[o] = t[o] : r && ir(`${$t(e)}: key not found: ${o}`);
-	} else if (Yr(n) && Mr(n) > 0) for (let o of Object.keys(n)) t.hasOwnProperty(o) ? l[o] = t[o] : r && ir(`${$t(e)}: key not found: ${o}`);
+		Object.prototype.hasOwnProperty.call(t, o) ? gl(l, o, t[o]) : r && ir(`${$t(e)}: key not found: ${o}`);
+	} else if (Yr(n) && Mr(n) > 0) for (let o of Object.keys(n)) Object.prototype.hasOwnProperty.call(t, o) ? gl(l, o, t[o]) : r && ir(`${$t(e)}: key not found: ${o}`);
 	else {
 		if (!(Br(n) && Wr(n) > 0)) return t;
 		for (let o = 0; o < n.length; o++) {
 			let i = n[o];
-			t.hasOwnProperty(i) ? l[i] = t[i] : r && ir(`${$t(e)}: key not found: ${i}`);
+			Object.prototype.hasOwnProperty.call(t, i) ? gl(l, i, t[i]) : r && ir(`${$t(e)}: key not found: ${i}`);
 		}
 	}
 	return l;
@@ -2225,13 +2228,13 @@ function Il(e, t, n, r) {
 	if (!Yr(t)) return l;
 	if (Dr(l, t), Jr(n) && !tl(n)) {
 		let o = n;
-		t.hasOwnProperty(o) ? Cr(l, o) : r && ir(`${$t(e)}: key not found: ${o}`);
-	} else if (Yr(n) && Mr(n) > 0) for (let o of Object.keys(n)) t.hasOwnProperty(o) ? Cr(l, o) : r && ir(`${$t(e)}: key not found: ${o}`);
+		Object.prototype.hasOwnProperty.call(t, o) ? Cr(l, o) : r && ir(`${$t(e)}: key not found: ${o}`);
+	} else if (Yr(n) && Mr(n) > 0) for (let o of Object.keys(n)) Object.prototype.hasOwnProperty.call(t, o) ? Cr(l, o) : r && ir(`${$t(e)}: key not found: ${o}`);
 	else {
 		if (!(Br(n) && Wr(n) > 0)) return {};
 		for (let o = 0; o < n.length; o++) {
 			let i = n[o];
-			t.hasOwnProperty(i) ? Cr(l, i) : r && ir(`${$t(e)}: key not found: ${i}`);
+			Object.prototype.hasOwnProperty.call(t, i) ? Cr(l, i) : r && ir(`${$t(e)}: key not found: ${i}`);
 		}
 	}
 	return l;
@@ -2326,7 +2329,7 @@ function Ml(e, t) {
 	if (e && !el(e) && ir("GObj bad instanceof"), !t) return [];
 	let n = [];
 	if (Jr(t)) n.push(t);
-	else if (Yr(t)) for (let e in t) t.hasOwnProperty(e) && n.push(e);
+	else if (Yr(t)) for (let e in t) Object.prototype.hasOwnProperty.call(t, e) && n.push(e);
 	else Br(t) && t.forEach(function(t) {
 		if (Jr(t)) tl(t) || n.push(t);
 		else if (Yr(t)) {
@@ -2456,7 +2459,7 @@ function eo(e, t, n) {
 function to(e, t, n) {
 	void 0 !== n && Jr(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,
@@ -2759,7 +2762,7 @@ function Co(e) {
 				return;
 			}
 		}
-		0 !== l && (t[r] = e);
+		0 !== l && gl(t, r, e);
 	};
 	return null == e || n(e, "", 0), t;
 }
@@ -2820,11 +2823,11 @@ function Fo(e, t) {
 	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 || {})) gl(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;
+		gl(e, n, r.to);
 	}
 	return e;
 }
@@ -3284,34 +3287,33 @@ var vi = {
 function Si(e) {
 	e.priv.websocket && ir("Websocket ALREADY setup");
 	const t = tn(e, "url");
-	let n;
 	ur(`====> Starting WebSocket to '${t}' (${$t(e)})`);
+	const n = ++e.priv.ws_seq;
+	let r;
 	try {
-		n = new WebSocket(t);
+		r = new WebSocket(t);
 	} catch (n) {
 		return ir(`${$t(e)}: Cannot open WebSocket to '${t}', Error: ${n.message}`), null;
 	}
-	if (!n) return ir(`${$t(e)}: Failed to initialize WebSocket.`), null;
-	const r = ++e.priv.ws_seq;
-	return n.onopen = () => {
-		r !== e.priv.ws_seq || Ct(e) || yn(e, "EV_ON_OPEN", {
+	return r ? (r.onopen = () => {
+		n !== e.priv.ws_seq || Ct(e) || yn(e, "EV_ON_OPEN", {
 			url: t,
-			ws_seq: r
+			ws_seq: n
 		}, e);
-	}, n.onmessage = (n) => {
-		r !== e.priv.ws_seq || Ct(e) || yn(e, "EV_ON_MESSAGE", {
+	}, r.onmessage = (r) => {
+		n !== e.priv.ws_seq || Ct(e) || yn(e, "EV_ON_MESSAGE", {
 			url: t,
-			data: n.data
+			data: r.data
 		}, e);
-	}, n.onclose = (n) => {
-		Ct(e) || r === e.priv.ws_seq && (Zt(Ot(), "browser_beforeunload") ? sr("Close websocket by unload page") : yn(e, "EV_ON_CLOSE", {
+	}, r.onclose = (r) => {
+		Ct(e) || n === e.priv.ws_seq && (Zt(Ot(), "browser_beforeunload") ? sr("Close websocket by unload page") : yn(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) : (ir(`${$t(e)}: Failed to initialize WebSocket.`), null);
 }
 function Ni(e, t = 1e3, n = "") {
 	let r = e.priv, l = r.websocket;