@yuneta/gobj-js 7.25.5 → 7.25.6

package/README.md

@@ -519,6 +519,13 @@ kw_has_key(kw, key)                                      // → boolean
 kw_pop(kw1, kw2)                                         // delete from kw1 the keys listed in kw2
 kw_delete(gobj, kw, path)
 kw_find_path(gobj, kw, path, verbose)                    // back-tick path: "a`b`c"
+// kw_find_path() answers undefined for a path that is not there, as C
+// answers NULL. A kw that is not a dict or a list, or a scalar in the
+// middle of the path, is logged ("kw must be list or dict"); an absent
+// or null middle segment is logged only when verbose. So a typed reader
+// handed a bad kw answers its DEFAULT:
+//   kw_get_int(gobj, null, "x", 5, 0)            → 5  (logged: kw must be list or dict)
+//   kw_get_str(gobj, {a: null}, "a`b", "d", 0)   → "d" (not logged)
 
 kw_get_bool(gobj, kw, path, default_value, flag)
 kw_get_int (gobj, kw, path, default_value, flag)

package/dist/gobj-js.cjs.js

@@ -3560,30 +3560,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;
 }
 /************************************************************
 *
@@ -3624,7 +3640,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;
@@ -3692,7 +3708,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;
@@ -3739,7 +3755,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;
@@ -3809,7 +3825,7 @@ 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 && !kw_path_holds_key(kw, path)) {