@yuneta/gobj-js 7.25.2 → 7.25.4

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

@@ -1746,7 +1746,7 @@ function Qr(e, t, n, r, l) {
 	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 || null !== o) return i && (rr(`${Dt(e)}: path value MUST BE a boolean: ${n}`), sr(t)), Boolean(r);
+		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;
 	}
 	return a && Hr(e, t, n), _;
@@ -1754,7 +1754,7 @@ function Qr(e, t, n, r, l) {
 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;
+	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) {
 			let l = parseInt(r);
@@ -1762,12 +1762,28 @@ function zr(e, t, n, r, l) {
 		}
 		return i && (rr(`path not found: '${n}'`), ar(t)), parseInt(r);
 	}
-	return a && Hr(e, t, n), $r(o) ? parseInt(o) : (i && (rr(`path value MUST BE a number: ${n}`), sr(t)), parseInt(r));
+	let _;
+	if ($r(o)) _ = Math.trunc(o);
+	else {
+		if (!u) return rr(`${e ? Dt(e) + ": " : ""}path MUST BE a json integer: '${n}'`), ar(t), parseInt(r);
+		if (Ar(o)) _ = o ? 1 : 0;
+		else if (Dr(o)) _ = function(e) {
+			const t = /^\s*([+-]?)(0[xX][0-9a-fA-F]+|0[0-7]*|[1-9][0-9]*)/.exec(e);
+			if (!t) return 0;
+			let n, r = t[2];
+			return n = r.length > 1 && ("x" === r[1] || "X" === r[1]) ? parseInt(r.substring(2), 16) : "0" === r[0] ? parseInt(r, 8) : parseInt(r, 10), "-" === t[1] ? -n : n;
+		}(o);
+		else {
+			if (null !== o) return rr(`${e ? Dt(e) + ": " : ""}path MUST BE a simple json element: '${n}'`), ar(t), 0;
+			_ = 0;
+		}
+	}
+	return a && Hr(e, t, n), _;
 }
 function Xr(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;
+	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) {
 			let l = Number(r);
@@ -1775,13 +1791,24 @@ function Xr(e, t, n, r, l) {
 		}
 		return i && (rr(`path not found: '${n}'`), ar(t)), Number(r);
 	}
-	return a && Hr(e, t, n), $r(o) ? Number(o) : (i && (rr(`path value MUST BE a number: ${n}`), sr(t)), Number(r));
+	let _;
+	if ($r(o)) _ = o;
+	else {
+		if (!u) return rr(`${e ? Dt(e) + ": " : ""}path MUST BE a json real: '${n}'`), ar(t), Number(r);
+		if (Ar(o)) _ = o ? 1 : 0;
+		else if (Dr(o)) _ = parseFloat(o), Number.isNaN(_) && (_ = 0);
+		else {
+			if (null !== o) return rr(`${e ? Dt(e) + ": " : ""}path MUST BE a simple json element: '${n}'`), ar(t), 0;
+			_ = 0;
+		}
+	}
+	return a && Hr(e, t, n), _;
 }
 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) : (a && Hr(e, t, n), Dr(o) ? o : (i && (rr(`${Dt(e)}: path value MUST BE a string: ${n}`), sr(t)), r));
+	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);
 }
 function el(e, t, n, r, l) {
 	e && !Ur(e) && rr("GObj bad instanceof");