@yuneta/gobj-js 7.26.14 → 7.26.16

package/dist/gobj-js.umd.js

@@ -3284,13 +3284,34 @@
 	}
 	/************************************************************
 	*  JSON.stringify for a log line: a circular object (a gobj,
-	*  a DOM node) must not make the log call itself throw.
+	*  a DOM node), a BigInt or a toJSON() that throws must not make
+	*  the log call itself throw -- and neither must the fallback:
+	*  String() throws too, on an object with no prototype or with a
+	*  toString() that throws.
 	************************************************************/
 	function log_stringify(v) {
 		try {
 			return JSON.stringify(v);
 		} catch (e) {
+			try {
+				return String(v);
+			} catch (e2) {
+				return `<${typeof v}: not printable>`;
+			}
+		}
+	}
+	function log_string(v) {
+		try {
 			return String(v);
+		} catch (e) {
+			return log_stringify(v);
+		}
+	}
+	function log_number(parse, v) {
+		try {
+			return parse(v);
+		} catch (e) {
+			return log_string(v);
 		}
 	}
 	function format_log(format) {
@@ -3302,18 +3323,18 @@
 			output = format.replace(/%[sdifoO]/g, (match) => {
 				const val = args[i++];
 				switch (match) {
-					case "%s": return String(val);
+					case "%s": return log_string(val);
 					case "%d":
-					case "%i": return parseInt(val);
-					case "%f": return parseFloat(val);
+					case "%i": return log_number(parseInt, val);
+					case "%f": return log_number(parseFloat, val);
 					case "%o":
-					case "%O": return typeof val === "object" ? log_stringify(val) : String(val);
+					case "%O": return typeof val === "object" ? log_stringify(val) : log_string(val);
 					default: return match;
 				}
 			});
-			const rest = args.slice(i).map((arg) => typeof arg === "object" ? log_stringify(arg) : String(arg));
+			const rest = args.slice(i).map((arg) => typeof arg === "object" ? log_stringify(arg) : log_string(arg));
 			if (rest.length > 0) output += " " + rest.join(" ");
-		} else output = args.map((arg) => typeof arg === "object" ? log_stringify(arg) : String(arg)).join(" ");
+		} else output = args.map((arg) => typeof arg === "object" ? log_stringify(arg) : log_string(arg)).join(" ");
 		return output;
 	}
 	function log_error(format, ...args) {
@@ -4368,6 +4389,13 @@
 				kw_set_dict_value(gobj, kw, path, default_value);
 				return default_value;
 			}
+			if (create && v === null) {
+				if (required) {
+					log_error(`path not found: '${path}'`);
+					trace_json_masked(kw);
+				}
+				return default_value;
+			}
 			if (required || create) {
 				log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}path MUST BE a json dict: '${path}'` + (create ? ", cannot create" : ""));
 				trace_json_masked(kw);
@@ -4432,6 +4460,13 @@
 				kw_set_dict_value(gobj, kw, path, default_value);
 				return default_value;
 			}
+			if (create && v === null) {
+				if (required) {
+					log_error(`path not found: '${path}'`);
+					trace_json_masked(kw);
+				}
+				return default_value;
+			}
 			if (required || create) {
 				log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}path MUST BE a json list: '${path}'` + (create ? ", cannot create" : ""));
 				trace_json_masked(kw);
@@ -4645,8 +4680,8 @@
 	["$key1", "$key2", ...]
 	{"$key1":*, "$key2":*, ...}
 	
-	It's not a deep copy, new keys are the paths.
-	If paths are empty return kw
+	It's not a deep copy. A key is a KEY, not a path (as C, SDK 7.26.9).
+	If keys are empty return kw
 	*************************************************************/
 	function kw_clone_by_keys(gobj, kw, keys, verbose) {
 		if (gobj && !is_gobj(gobj)) log_error(`GObj bad instanceof`);
@@ -4673,8 +4708,8 @@
 	["$key1", "$key2", ...]
 	{"$key1":*, "$key2":*, ...}
 	
-	It's not a deep copy, new keys are the paths.
-	If paths are empty return empty
+	It's not a deep copy. A key is a KEY, not a path (as C, SDK 7.26.9).
+	If keys are empty return empty
 	***************************************************************************/
 	function kw_clone_by_not_keys(gobj, kw, keys, verbose) {
 		let kw_clone = {};
@@ -5257,17 +5292,6 @@
 		return jdb;
 	}
 	/********************************************
-	*  A value as json text for a log line: the error path must not throw
-	*  (a circular record, a BigInt).
-	********************************************/
-	function safe_json_text(v) {
-		try {
-			return JSON.stringify(v);
-		} catch (e) {
-			return `<${typeof v}: not json (${e.message})>`;
-		}
-	}
-	/********************************************
 	*
 	********************************************/
 	function jdb_update(jdb, topic_name, path, kw) {
@@ -5277,7 +5301,7 @@
 			return null;
 		}
 		if (!is_object(kw) || empty_string(kw["id"])) {
-			log_error(`jdb_update: record without id: ${safe_json_text(kw)}`);
+			log_error(`jdb_update: record without id: ${log_stringify(kw)}`);
 			return null;
 		}
 		if (!is_string(path)) {
@@ -5330,7 +5354,7 @@
 			return null;
 		}
 		if (!is_object(kw) || empty_string(kw["id"])) {
-			log_error(`jdb_delete: record without id: ${safe_json_text(kw)}`);
+			log_error(`jdb_delete: record without id: ${log_stringify(kw)}`);
 			return null;
 		}
 		if (!is_string(path)) {