@yuneta/gobj-js 7.25.4 → 7.25.6

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

@@ -1714,13 +1714,17 @@ function Jr(e, t) {
 	return !(!(t in e) || !e.hasOwnProperty(t));
 }
 function qr(e, t, n, r) {
-	if (e && !Ur(e) && rr("GObj bad instanceof"), !wr(t) && !jr(t)) return rr(`${Dt(e)}: kw must be list or dict`), 0;
-	if (!Dr(n)) return rr(`${Dt(e)}: path must be a string: ${String(n)}`), 0;
-	let l = n.split("`");
-	if (l.length <= 1) return t[n];
-	let o = l.length;
-	for (let i = 0; i < o; i++) if (void 0 === (t = t[l[i]])) return void (r && rr(`${Dt(e)}: path not found: ${String(n)}`));
-	return t;
+	e && !Ur(e) && rr("GObj bad instanceof");
+	const l = e ? `${Dt(e)}: ` : "";
+	if (!wr(t) && !jr(t)) return void rr(`${l}kw must be list or dict: '${String(n)}'`);
+	if (!Dr(n)) return void rr(`${l}path must be a string: ${String(n)}`);
+	let o = n.split("`"), i = o.length;
+	for (let e = 0; e < i - 1; e++) {
+		if (null == (t = t[o[e]])) return void (r && rr(`${l}path not found: '${n}'`));
+		if (!wr(t) && !jr(t)) return void rr(`${l}kw must be list or dict: '${n}'`);
+	}
+	let s = t[o[i - 1]];
+	return void 0 === s && r && rr(`${l}path not found: '${n}'`), s;
 }
 function Hr(e, t, n) {
 	e && !Ur(e) && rr("GObj bad instanceof");
@@ -1735,7 +1739,7 @@ function Qr(e, t, n, r, l) {
 	let o = qr(e, t, n, !1);
 	const i = l && l & Pn.KW_REQUIRED, s = l && l & Pn.KW_CREATE, a = l && l & Pn.KW_EXTRACT, u = l && l & Pn.KW_WILD_NUMBER;
 	if (void 0 === o) {
-		if (s) {
+		if (s && t) {
 			let l = Boolean(r);
 			return ll(e, t, n, l), l;
 		}
@@ -1744,7 +1748,7 @@ function Qr(e, t, n, r, l) {
 	let _;
 	if (Ar(o)) _ = o;
 	else if (u && $r(o)) _ = 0 !== o;
-	else if (u && Dr(o)) _ = "true" === o.toLowerCase() || "false" !== o.toLowerCase() && 0 !== (parseInt(o) || 0);
+	else if (u && Dr(o)) _ = "true" === o.toLowerCase() || "false" !== o.toLowerCase() && 0 !== (parseInt(o, 10) || 0);
 	else {
 		if (!u || null !== o) return u ? (rr(`${e ? Dt(e) + ": " : ""}path MUST BE a simple json element: '${n}'`), ar(t), !1) : (rr(`${e ? Dt(e) + ": " : ""}path MUST BE a json boolean: '${n}'`), ar(t), Boolean(r));
 		_ = !1;
@@ -1756,7 +1760,7 @@ function zr(e, t, n, r, l) {
 	let o = qr(e, t, n, !1);
 	const i = l && l & Pn.KW_REQUIRED, s = l && l & Pn.KW_CREATE, a = l && l & Pn.KW_EXTRACT, u = l && l & Pn.KW_WILD_NUMBER;
 	if (void 0 === o) {
-		if (s) {
+		if (s && t) {
 			let l = parseInt(r);
 			return ll(e, t, n, l), l;
 		}
@@ -1785,7 +1789,7 @@ function Xr(e, t, n, r, l) {
 	let o = qr(e, t, n, !1);
 	const i = l && l & Pn.KW_REQUIRED, s = l && l & Pn.KW_CREATE, a = l && l & Pn.KW_EXTRACT, u = l && l & Pn.KW_WILD_NUMBER;
 	if (void 0 === o) {
-		if (s) {
+		if (s && t) {
 			let l = Number(r);
 			return ll(e, t, n, l), l;
 		}
@@ -1808,7 +1812,14 @@ function Zr(e, t, n, r, l) {
 	e && !Ur(e) && rr("GObj bad instanceof");
 	let o = qr(e, t, n, !1);
 	const i = l && l & Pn.KW_REQUIRED, s = l && l & Pn.KW_CREATE, a = l && l & Pn.KW_EXTRACT;
-	return void 0 === o ? s ? (ll(e, t, n, Dr(r) ? r : null), r) : (i && (rr(`path not found: '${n}'`), ar(t)), r) : Dr(o) ? (a && Hr(e, t, n), o) : (i && (rr(`${Dt(e)}: path value MUST BE a string: ${n}`), sr(t)), r);
+	return void 0 === o ? s && t ? (ll(e, t, n, Dr(r) ? r : null), r) : (i && !function(e, t) {
+		let n = Dr(t) ? t.split("`") : [], r = e;
+		for (let e = 0; e < n.length - 1; e++) {
+			if (!wr(r) && !jr(r)) return !1;
+			r = r[n[e]];
+		}
+		return !(!wr(r) && !jr(r) || 0 === n.length) && Object.prototype.hasOwnProperty.call(r, n[n.length - 1]);
+	}(t, n) && (rr(`path not found: '${n}'`), ar(t)), r) : Dr(o) ? (a && Hr(e, t, n), o) : (null !== o && (rr(`${e ? Dt(e) + ": " : ""}path MUST BE a json str: '${n}'`), ar(t)), r);
 }
 function el(e, t, n, r, l) {
 	e && !Ur(e) && rr("GObj bad instanceof");
@@ -1827,7 +1838,7 @@ function tl(e, t, n, r, l) {
 	e && !Ur(e) && rr("GObj bad instanceof");
 	let o = qr(e, t, n, !1);
 	const i = l && l & Pn.KW_REQUIRED, s = l && l & Pn.KW_CREATE, a = l && l & Pn.KW_EXTRACT;
-	return void 0 === o ? s && wr(r) && t ? (ll(e, t, n, r), r) : (i && (rr(`path not found: '${n}'`), ar(t)), r) : wr(o) ? (a && Hr(e, t, n), o) : (i && (rr(`${Dt(e)}: path value MUST BE a dict: ${n}`), sr(t)), r);
+	return void 0 === o ? s && wr(r) && t ? (ll(e, t, n, r), r) : (i && (rr(`path not found: '${n}'`), ar(t)), r) : wr(o) ? (a && Hr(e, t, n), o) : (i && (rr(`${e ? Dt(e) + ": " : ""}path MUST BE a json dict: '${n}'`), ar(t)), r);
 }
 function nl(e, t, n, r, l) {
 	e && !Ur(e) && rr("GObj bad instanceof");
@@ -1846,7 +1857,7 @@ function rl(e, t, n, r, l) {
 	e && !Ur(e) && rr("GObj bad instanceof");
 	let o = qr(e, t, n, !1);
 	const i = l && l & Pn.KW_REQUIRED, s = l && l & Pn.KW_CREATE, a = l && l & Pn.KW_EXTRACT;
-	return void 0 === o ? s && jr(r) && t ? (ll(e, t, n, r), r) : (i && (rr(`path not found: '${n}'`), ar(t)), r) : jr(o) ? (a && Hr(e, t, n), o) : (i && (rr(`${Dt(e)}: path value MUST BE an array: ${n}`), sr(t)), r);
+	return void 0 === o ? s && jr(r) && t ? (ll(e, t, n, r), r) : (i && (rr(`path not found: '${n}'`), ar(t)), r) : jr(o) ? (a && Hr(e, t, n), o) : (i && (rr(`${e ? Dt(e) + ": " : ""}path MUST BE a json list: '${n}'`), ar(t)), r);
 }
 function ll(e, t, n, r) {
 	if (e && !Ur(e) && rr("GObj bad instanceof"), !wr(t)) return rr("kw is not an object"), -1;