@yuneta/gobj-js 7.25.4 → 7.25.6

package/dist/gobj-js.es.js

@@ -3031,7 +3031,7 @@ function gobj_stats(gobj, stats, kw, src) {
 *
 *      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,
@@ -3559,30 +3559,46 @@ function kw_has_key(kw, key) {
 	return false;
 }
 /************************************************************
-*
+*  The value at `path` (keys joined by a backtick), as the C
+*  kw_find_path() finds it: undefined when it is not there.
+*  A kw that is not a dict or a list is LOGGED ("kw must be list
+*  or dict") and answers undefined, as C answers NULL; so does a
+*  segment in the middle of the path whose value is a scalar. A
+*  middle segment that is absent or null answers undefined, logged
+*  only when `verbose`. Before gobj-js 7.25.6 a bad kw answered 0,
+*  which the typed readers took for a value found (kw_get_int() and
+*  kw_get_real() answered 0 instead of the default, kw_get_str() and
+*  kw_get_bool() logged a second line), the log named no path and
+*  called gobj_short_name() on a null gobj ("gobj bad type"), and a
+*  null middle segment threw a TypeError.
 ************************************************************/
 function kw_find_path(gobj, kw, path, verbose) {
 	if (gobj && !is_gobj(gobj)) log_error(`GObj bad instanceof`);
+	const prefix = gobj ? `${gobj_short_name(gobj)}: ` : "";
 	if (!(is_object(kw) || is_array(kw))) {
-		log_error(`${gobj_short_name(gobj)}: kw must be list or dict`);
-		return 0;
+		log_error(`${prefix}kw must be list or dict: '${String(path)}'`);
+		return;
 	}
 	if (!is_string(path)) {
-		log_error(`${gobj_short_name(gobj)}: path must be a string: ${String(path)}`);
-		return 0;
+		log_error(`${prefix}path must be a string: ${String(path)}`);
+		return;
 	}
 	let ss = path.split("`");
-	if (ss.length <= 1) return kw[path];
 	let len = ss.length;
-	for (let i = 0; i < len; i++) {
-		let key = ss[i];
-		kw = kw[key];
-		if (kw === void 0) {
-			if (verbose) log_error(`${gobj_short_name(gobj)}: path not found: ${String(path)}`);
+	for (let i = 0; i < len - 1; i++) {
+		kw = kw[ss[i]];
+		if (kw === void 0 || kw === null) {
+			if (verbose) log_error(`${prefix}path not found: '${path}'`);
+			return;
+		}
+		if (!(is_object(kw) || is_array(kw))) {
+			log_error(`${prefix}kw must be list or dict: '${path}'`);
 			return;
 		}
 	}
-	return kw;
+	let value = kw[ss[len - 1]];
+	if (value === void 0 && verbose) log_error(`${prefix}path not found: '${path}'`);
+	return value;
 }
 /************************************************************
 *
@@ -3607,10 +3623,13 @@ function kw_delete(gobj, kw, path) {
 *  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`);
@@ -3620,7 +3639,7 @@ function kw_get_bool(gobj, kw, path, default_value, flag) {
 	const extract = flag && flag & kw_flag_t.KW_EXTRACT;
 	const wild = flag && flag & kw_flag_t.KW_WILD_NUMBER;
 	if (b === void 0) {
-		if (create) {
+		if (create && kw) {
 			let v = Boolean(default_value);
 			kw_set_dict_value(gobj, kw, path, v);
 			return v;
@@ -3636,7 +3655,7 @@ function kw_get_bool(gobj, kw, path, default_value, flag) {
 	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}'`);
@@ -3688,7 +3707,7 @@ function kw_get_int(gobj, kw, path, default_value, flag) {
 	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) {
+		if (create && kw) {
 			let v = parseInt(default_value);
 			kw_set_dict_value(gobj, kw, path, v);
 			return v;
@@ -3735,7 +3754,7 @@ function kw_get_real(gobj, kw, path, default_value, flag) {
 	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) {
+		if (create && kw) {
 			let v = Number(default_value);
 			kw_set_dict_value(gobj, kw, path, v);
 			return v;
@@ -3765,6 +3784,21 @@ function kw_get_real(gobj, kw, path, default_value, flag) {
 	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]];
+	}
+	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()
 *  (`const char *default_value`, where 0 is NULL). Turned into
 *  a string, a default of 0 or null was "0" or "null", which is
@@ -3776,6 +3810,12 @@ function kw_get_real(gobj, kw, path, default_value, flag) {
 *  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`);
@@ -3784,19 +3824,19 @@ function kw_get_str(gobj, kw, path, default_value, flag) {
 	const create = flag && flag & kw_flag_t.KW_CREATE;
 	const extract = flag && flag & kw_flag_t.KW_EXTRACT;
 	if (v === void 0) {
-		if (create) {
+		if (create && kw) {
 			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 (!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;
 	}
@@ -3852,8 +3892,8 @@ function kw_get_dict(gobj, kw, path, default_value, flag) {
 	}
 	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;
 	}
@@ -3910,8 +3950,8 @@ function kw_get_list(gobj, kw, path, default_value, flag) {
 	}
 	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;
 	}