@yuneta/gobj-js 7.25.0 → 7.25.2

package/dist/gobj-js.umd.js

@@ -3218,8 +3218,8 @@
 	}
 	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());
 	}
@@ -3607,7 +3607,11 @@
 		return 0;
 	}
 	/************************************************************
-	*
+	*  As the C kw_get_bool(): a boolean found is the answer, and
+	*  anything else gives the default back -- 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). Before gobj-js
+	*  7.25.2 the value went through Boolean(), so "false" was TRUE.
 	************************************************************/
 	function kw_get_bool(gobj, kw, path, default_value, flag) {
 		if (gobj && !is_gobj(gobj)) log_error(`GObj bad instanceof`);
@@ -3615,6 +3619,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 (b === void 0) {
 			if (create) {
 				let v = Boolean(default_value);
@@ -3626,8 +3631,23 @@
 			}
 			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 (required) {
+				log_error(`${gobj_short_name(gobj)}: path value MUST BE a boolean: ${path}`);
+				trace_msg(kw);
+			}
+			return Boolean(default_value);
+		}
 		if (extract) kw_delete(gobj, kw, path);
-		return Boolean(b);
+		return value;
 	}
 	/************************************************************
 	*
@@ -3690,7 +3710,12 @@
 		return Number(v);
 	}
 	/************************************************************
-	*
+	*  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
+	*  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.
 	************************************************************/
 	function kw_get_str(gobj, kw, path, default_value, flag) {
 		if (gobj && !is_gobj(gobj)) log_error(`GObj bad instanceof`);
@@ -3700,14 +3725,13 @@
 		const extract = flag && flag & kw_flag_t.KW_EXTRACT;
 		if (v === void 0) {
 			if (create) {
-				let v = String(default_value);
-				kw_set_dict_value(gobj, kw, path, v);
-				return v;
+				kw_set_dict_value(gobj, kw, path, is_string(default_value) ? default_value : null);
+				return default_value;
 			} else if (required) {
 				log_error(`path not found: '${path}'`);
 				trace_json(kw);
 			}
-			return String(default_value);
+			return default_value;
 		}
 		if (extract) kw_delete(gobj, kw, path);
 		if (!is_string(v)) {
@@ -3715,9 +3739,9 @@
 				log_error(`${gobj_short_name(gobj)}: path value MUST BE a string: ${path}`);
 				trace_msg(kw);
 			}
-			return String(default_value);
+			return default_value;
 		}
-		return String(v);
+		return v;
 	}
 	/************************************************************
 	*
@@ -3743,7 +3767,11 @@
 		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 +3780,25 @@
 		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 +3824,12 @@
 		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 +3838,25 @@
 		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 +3892,7 @@
 			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;