@yuneta/gobj-js 7.25.5 → 7.25.7

package/dist/gobj-js.umd.js

@@ -3563,30 +3563,46 @@
 		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;
 	}
 	/************************************************************
 	*
@@ -3627,7 +3643,7 @@
 		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;
@@ -3695,7 +3711,7 @@
 		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;
@@ -3742,7 +3758,7 @@
 		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;
@@ -3812,7 +3828,7 @@
 		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)) {
@@ -3965,7 +3981,12 @@
 			let key = ss[i];
 			if (i === len - 1) kw[key] = value;
 			else {
-				if (kw[key] === void 0) kw[key] = {};
+				let seg = kw[key];
+				if (seg === void 0) kw[key] = {};
+				else if (!is_object(seg) && !is_array(seg)) {
+					log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}kw_set_dict_value(): segment '${key}' is not a dict or a list: '${path}'`);
+					return -1;
+				}
 				kw = kw[key];
 			}
 		}