@yuneta/gobj-js 7.25.3 → 7.25.5

package/dist/gobj-js.umd.js

@@ -3035,7 +3035,7 @@
 	*
 	*      Licence: MIT (http://www.opensource.org/licenses/mit-license)
 	*      Copyright (c) 2014,2024 Niyamaka.
-	*      Copyright (c) 2025, ArtGins.
+	*      Copyright (c) 2025-2026, ArtGins.
 	*********************************************************************************/
 	var kw_flag_t = Object.freeze({
 		KW_REQUIRED: 1,
@@ -3611,10 +3611,13 @@
 	*  anything else gives the default back, LOGGED ("path MUST BE a
 	*  json boolean", required or not) -- unless KW_WILD_NUMBER asks
 	*  to read a number (0 is false), a string ("true"/"false" in any
-	*  case, else its integer) or null (false); a list or a dict is
-	*  then false, logged too. Before gobj-js 7.25.2 the value went
-	*  through Boolean(), so "false" was TRUE; before 7.25.3 a value
-	*  of the wrong type gave the default back in silence.
+	*  case, else its decimal integer as atoi() reads it: "0x1F" is 0,
+	*  so false) or null (false); a list or a dict is then false,
+	*  logged too. Before gobj-js 7.25.2 the value went through
+	*  Boolean(), so "false" was TRUE; before 7.25.3 a value of the
+	*  wrong type gave the default back in silence; before 7.25.5 the
+	*  string went through parseInt() with no base, which reads hex:
+	*  "0x1F" was TRUE.
 	************************************************************/
 	function kw_get_bool(gobj, kw, path, default_value, flag) {
 		if (gobj && !is_gobj(gobj)) log_error(`GObj bad instanceof`);
@@ -3640,7 +3643,7 @@
 		else if (wild && is_string(b)) {
 			if (b.toLowerCase() === "true") value = true;
 			else if (b.toLowerCase() === "false") value = false;
-			else value = (parseInt(b) || 0) !== 0;
+			else value = (parseInt(b, 10) || 0) !== 0;
 		} else if (wild && b === null) value = false;
 		else if (wild) {
 			log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}path MUST BE a simple json element: '${path}'`);
@@ -3655,7 +3658,34 @@
 		return value;
 	}
 	/************************************************************
-	*
+	*  The integer at the start of a string, as C's strtoll(s, 0, 0)
+	*  reads it: leading spaces, a sign, then "0x" for hex, "0" for
+	*  octal, else decimal, up to the first character that is not a
+	*  digit of that base. 0 when there is no digit.
+	************************************************************/
+	function strtoll_base0(s) {
+		const m = /^\s*([+-]?)(0[xX][0-9a-fA-F]+|0[0-7]*|[1-9][0-9]*)/.exec(s);
+		if (!m) return 0;
+		let digits = m[2];
+		let value;
+		if (digits.length > 1 && (digits[1] === "x" || digits[1] === "X")) value = parseInt(digits.substring(2), 16);
+		else if (digits[0] === "0") value = parseInt(digits, 8);
+		else value = parseInt(digits, 10);
+		return m[1] === "-" ? -value : value;
+	}
+	/************************************************************
+	*  As the C kw_get_int(): a number found is the answer,
+	*  truncated toward zero as C casts a real, and anything else
+	*  gives the default back (as an integer), LOGGED ("path MUST BE
+	*  a json integer", required or not) -- unless KW_WILD_NUMBER
+	*  asks to read a boolean (1/0), a string (as strtoll() with base
+	*  0: "0x1F" is 31, "017" is 15, "12abc" is 12, "abc" is 0) or
+	*  null (0); a list or a dict is then 0, logged too. KW_EXTRACT
+	*  takes out only a value the reader answers with.
+	*  Before gobj-js 7.25.4 KW_EXTRACT deleted the value before its
+	*  type was looked at, a value of another type was logged only
+	*  with KW_REQUIRED, KW_WILD_NUMBER was ignored, and a number went
+	*  through parseInt(), which reads it as a string: 1e-7 gave 1.
 	************************************************************/
 	function kw_get_int(gobj, kw, path, default_value, flag) {
 		if (gobj && !is_gobj(gobj)) log_error(`GObj bad instanceof`);
@@ -3663,6 +3693,7 @@
 		const required = flag && flag & kw_flag_t.KW_REQUIRED;
 		const create = flag && flag & kw_flag_t.KW_CREATE;
 		const extract = flag && flag & kw_flag_t.KW_EXTRACT;
+		const wild = flag && flag & kw_flag_t.KW_WILD_NUMBER;
 		if (v === void 0) {
 			if (create) {
 				let v = parseInt(default_value);
@@ -3674,18 +3705,34 @@
 			}
 			return parseInt(default_value);
 		}
-		if (extract) kw_delete(gobj, kw, path);
-		if (!is_number(v)) {
-			if (required) {
-				log_error(`path value MUST BE a number: ${path}`);
-				trace_msg(kw);
-			}
+		let value;
+		if (is_number(v)) value = Math.trunc(v);
+		else if (!wild) {
+			log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}path MUST BE a json integer: '${path}'`);
+			trace_json(kw);
 			return parseInt(default_value);
+		} else if (is_boolean(v)) value = v ? 1 : 0;
+		else if (is_string(v)) value = strtoll_base0(v);
+		else if (v === null) value = 0;
+		else {
+			log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}path MUST BE a simple json element: '${path}'`);
+			trace_json(kw);
+			return 0;
 		}
-		return parseInt(v);
+		if (extract) kw_delete(gobj, kw, path);
+		return value;
 	}
 	/************************************************************
-	*
+	*  As the C kw_get_real(): a number found is the answer, and
+	*  anything else gives the default back (as a number), LOGGED
+	*  ("path MUST BE a json real", required or not) -- unless
+	*  KW_WILD_NUMBER asks to read a boolean (1/0), a string (as
+	*  parseFloat() reads it, 0 when it does not start with a number)
+	*  or null (0); a list or a dict is then 0, logged too.
+	*  KW_EXTRACT takes out only a value the reader answers with.
+	*  Before gobj-js 7.25.4 KW_EXTRACT deleted the value before its
+	*  type was looked at, a value of another type was logged only
+	*  with KW_REQUIRED, and KW_WILD_NUMBER was ignored.
 	************************************************************/
 	function kw_get_real(gobj, kw, path, default_value, flag) {
 		if (gobj && !is_gobj(gobj)) log_error(`GObj bad instanceof`);
@@ -3693,6 +3740,7 @@
 		const required = flag && flag & kw_flag_t.KW_REQUIRED;
 		const create = flag && flag & kw_flag_t.KW_CREATE;
 		const extract = flag && flag & kw_flag_t.KW_EXTRACT;
+		const wild = flag && flag & kw_flag_t.KW_WILD_NUMBER;
 		if (v === void 0) {
 			if (create) {
 				let v = Number(default_value);
@@ -3704,15 +3752,39 @@
 			}
 			return Number(default_value);
 		}
-		if (extract) kw_delete(gobj, kw, path);
-		if (!is_number(v)) {
-			if (required) {
-				log_error(`path value MUST BE a number: ${path}`);
-				trace_msg(kw);
-			}
+		let value;
+		if (is_number(v)) value = v;
+		else if (!wild) {
+			log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}path MUST BE a json real: '${path}'`);
+			trace_json(kw);
 			return Number(default_value);
+		} else if (is_boolean(v)) value = v ? 1 : 0;
+		else if (is_string(v)) {
+			value = parseFloat(v);
+			if (Number.isNaN(value)) value = 0;
+		} else if (v === null) value = 0;
+		else {
+			log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}path MUST BE a simple json element: '${path}'`);
+			trace_json(kw);
+			return 0;
+		}
+		if (extract) kw_delete(gobj, kw, path);
+		return value;
+	}
+	/************************************************************
+	*  TRUE when the last key of `path` is a key of its dict, whatever
+	*  its value: kw_find_path() answers undefined both for a key that
+	*  is not there and for one whose value is undefined.
+	************************************************************/
+	function kw_path_holds_key(kw, path) {
+		let ss = is_string(path) ? path.split("`") : [];
+		let parent = kw;
+		for (let i = 0; i < ss.length - 1; i++) {
+			if (!(is_object(parent) || is_array(parent))) return false;
+			parent = parent[ss[i]];
 		}
-		return Number(v);
+		if (!(is_object(parent) || is_array(parent)) || ss.length === 0) return false;
+		return Object.prototype.hasOwnProperty.call(parent, ss[ss.length - 1]);
 	}
 	/************************************************************
 	*  The default comes back AS GIVEN, as in the C kw_get_str()
@@ -3721,6 +3793,17 @@
 	*  TRUE: an `if(value)` on the answer took an absent key for a
 	*  present one. KW_CREATE stores a string default, and null for
 	*  any other, as C stores json_null() for a NULL default.
+	*  KW_EXTRACT takes out only a string (before gobj-js 7.25.4 it
+	*  deleted any value, and a value that was not a string was lost).
+	*  C refuses to extract a string at all ("Cannot extract a
+	*  string": its answer would point into the freed json); a JS
+	*  string outlives the kw, so here it is taken out.
+	*  A value that is there and is not a string gives the default
+	*  back, LOGGED ("path MUST BE a json str", required or not), as
+	*  C does; a null value is the key saying "no string" and is not
+	*  logged, and KW_REQUIRED logs only a path that is not there at
+	*  all. Before gobj-js 7.25.5 a value of another type was logged
+	*  only with KW_REQUIRED, and then a null one too.
 	************************************************************/
 	function kw_get_str(gobj, kw, path, default_value, flag) {
 		if (gobj && !is_gobj(gobj)) log_error(`GObj bad instanceof`);
@@ -3732,20 +3815,20 @@
 			if (create) {
 				kw_set_dict_value(gobj, kw, path, is_string(default_value) ? default_value : null);
 				return default_value;
-			} else if (required) {
+			} else if (required && !kw_path_holds_key(kw, path)) {
 				log_error(`path not found: '${path}'`);
 				trace_json(kw);
 			}
 			return default_value;
 		}
-		if (extract) kw_delete(gobj, kw, path);
 		if (!is_string(v)) {
-			if (required) {
-				log_error(`${gobj_short_name(gobj)}: path value MUST BE a string: ${path}`);
-				trace_msg(kw);
+			if (v !== null) {
+				log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}path MUST BE a json str: '${path}'`);
+				trace_json(kw);
 			}
 			return default_value;
 		}
+		if (extract) kw_delete(gobj, kw, path);
 		return v;
 	}
 	/************************************************************
@@ -3797,8 +3880,8 @@
 		}
 		if (!is_object(v)) {
 			if (required) {
-				log_error(`${gobj_short_name(gobj)}: path value MUST BE a dict: ${path}`);
-				trace_msg(kw);
+				log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}path MUST BE a json dict: '${path}'`);
+				trace_json(kw);
 			}
 			return default_value;
 		}
@@ -3855,8 +3938,8 @@
 		}
 		if (!is_array(v)) {
 			if (required) {
-				log_error(`${gobj_short_name(gobj)}: path value MUST BE an array: ${path}`);
-				trace_msg(kw);
+				log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}path MUST BE a json list: '${path}'`);
+				trace_json(kw);
 			}
 			return default_value;
 		}