@yuneta/gobj-js 7.25.1 → 7.25.3

package/dist/gobj-js.es.js

@@ -3214,8 +3214,8 @@ function trace_msg(format) {
 }
 function trace_json(jn, msg) {
 	if (console_wants("json", msg)) {
-		if (msg) window.console.warn("=====> " + msg);
-		window.console.dir(jn);
+		if (msg) _console.warn("=====> " + msg);
+		_console.dir(jn);
 	}
 	emit_log_callback("json", jn, current_timestamp());
 }
@@ -3603,7 +3603,14 @@ function kw_delete(gobj, kw, path) {
 	return 0;
 }
 /************************************************************
-*
+*  As the C kw_get_bool(): a boolean found is the answer, and
+*  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.
 ************************************************************/
 function kw_get_bool(gobj, kw, path, default_value, flag) {
 	if (gobj && !is_gobj(gobj)) log_error(`GObj bad instanceof`);
@@ -3611,6 +3618,7 @@ function kw_get_bool(gobj, kw, path, default_value, flag) {
 	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 (b === void 0) {
 		if (create) {
 			let v = Boolean(default_value);
@@ -3622,8 +3630,25 @@ function kw_get_bool(gobj, kw, path, default_value, flag) {
 		}
 		return Boolean(default_value);
 	}
+	let value;
+	if (is_boolean(b)) value = b;
+	else if (wild && is_number(b)) value = b !== 0;
+	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 if (wild && b === null) value = false;
+	else if (wild) {
+		log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}path MUST BE a simple json element: '${path}'`);
+		trace_json(kw);
+		return false;
+	} else {
+		log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}path MUST BE a json boolean: '${path}'`);
+		trace_json(kw);
+		return Boolean(default_value);
+	}
 	if (extract) kw_delete(gobj, kw, path);
-	return Boolean(b);
+	return value;
 }
 /************************************************************
 *
@@ -3743,7 +3768,11 @@ function kw_get_pointer(gobj, kw, path, default_value, flag) {
 	return v;
 }
 /************************************************************
-*
+*  As the C kw_get_dict(): a dict found is the answer, and
+*  anything else gives the default back AS GIVEN (null stays
+*  null). KW_CREATE stores a dict default, never a null one.
+*  Before gobj-js 7.25.2 the answer went through Object(), so a
+*  null default came back as {} and a 0 as a Number object.
 ************************************************************/
 function kw_get_dict(gobj, kw, path, default_value, flag) {
 	if (gobj && !is_gobj(gobj)) log_error(`GObj bad instanceof`);
@@ -3752,25 +3781,25 @@ function kw_get_dict(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) {
-			let v = Object(default_value);
-			kw_set_dict_value(gobj, kw, path, v);
-			return v;
-		} else if (required) {
+		if (create && is_object(default_value) && kw) {
+			kw_set_dict_value(gobj, kw, path, default_value);
+			return default_value;
+		}
+		if (required) {
 			log_error(`path not found: '${path}'`);
 			trace_json(kw);
 		}
-		return Object(default_value);
+		return default_value;
 	}
-	if (extract) kw_delete(gobj, kw, path);
 	if (!is_object(v)) {
 		if (required) {
-			log_error(`path value MUST BE a dict: ${path}`);
+			log_error(`${gobj_short_name(gobj)}: path value MUST BE a dict: ${path}`);
 			trace_msg(kw);
 		}
-		return Object(default_value);
+		return default_value;
 	}
-	return Object(v);
+	if (extract) kw_delete(gobj, kw, path);
+	return v;
 }
 /************************************************************
 *
@@ -3796,7 +3825,12 @@ function kw_get_dict_value(gobj, kw, path, default_value, flag) {
 	return v;
 }
 /************************************************************
-*
+*  As the C kw_get_list(): a list found is the answer, and
+*  anything else gives the default back AS GIVEN. KW_CREATE
+*  stores a list default, never a null one. Before gobj-js
+*  7.25.2 the answer went through Array(), which WRAPS its
+*  argument: a list found came back as [list], a default of []
+*  as [[]] and a null one as [null].
 ************************************************************/
 function kw_get_list(gobj, kw, path, default_value, flag) {
 	if (gobj && !is_gobj(gobj)) log_error(`GObj bad instanceof`);
@@ -3805,25 +3839,25 @@ function kw_get_list(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) {
-			let v = Array(default_value);
-			kw_set_dict_value(gobj, kw, path, v);
-			return v;
-		} else if (required) {
+		if (create && is_array(default_value) && kw) {
+			kw_set_dict_value(gobj, kw, path, default_value);
+			return default_value;
+		}
+		if (required) {
 			log_error(`path not found: '${path}'`);
 			trace_json(kw);
 		}
-		return Array(default_value);
+		return default_value;
 	}
-	if (extract) kw_delete(gobj, kw, path);
 	if (!is_array(v)) {
 		if (required) {
-			log_error(`path value MUST BE an array: ${path}`);
+			log_error(`${gobj_short_name(gobj)}: path value MUST BE an array: ${path}`);
 			trace_msg(kw);
 		}
-		return Array(default_value);
+		return default_value;
 	}
-	return Array(v);
+	if (extract) kw_delete(gobj, kw, path);
+	return v;
 }
 /************************************************************
 *
@@ -3859,7 +3893,7 @@ function kw_set_subdict_value(gobj, kw, path, key, value) {
 		log_error("kw is not an object");
 		return -1;
 	}
-	let subdict = kw_get_dict(gobj, kw, path, {}, true, true);
+	let subdict = kw_get_dict(gobj, kw, path, {}, kw_flag_t.KW_CREATE);
 	if (!is_object(subdict)) {
 		log_error("subdict is not an object");
 		return -1;