@yuneta/gobj-js 7.26.15 → 7.26.17

package/dist/gobj-js.cjs.js

@@ -3208,11 +3208,7 @@ var LOG_BACKLOG_MAX = 600;
 var __log_backlog__ = [];
 function keep_in_backlog(level, msg, hora) {
 	let m = msg;
-	if (level === "json") try {
-		m = JSON.stringify(msg);
-	} catch (e) {
-		m = String(msg);
-	}
+	if (level === "json") m = log_stringify(msg);
 	__log_backlog__.push([
 		level,
 		m,
@@ -3297,38 +3293,67 @@ function log_stringify(v) {
 		}
 	}
 }
+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) {
 	const args = Array.prototype.slice.call(arguments);
 	let output = "";
 	if (typeof format === "string") {
 		if (args.length === 1) return format;
 		let i = 1;
-		output = format.replace(/%[sdifoO]/g, (match) => {
+		output = format.replace(/%[sdifoOj%]/g, (match) => {
+			if (match === "%%") return "%";
 			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":
+					if (typeof val === "bigint") return val.toString();
+					return log_number(parseInt, val);
+				case "%f":
+					if (typeof val === "bigint") return val.toString();
+					return log_number(parseFloat, val);
+				case "%j": return log_stringify(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 call_log_function(fn, ...args) {
+	try {
+		fn(...args);
+	} catch (e) {
+		try {
+			_console.error("a log function threw:", e);
+		} catch (e2) {}
+	}
+}
 function log_error(format, ...args) {
 	let msg = format_log(format, ...args);
 	let hora = current_timestamp();
 	if (f_error) {
 		if (f_error === _console.error) {
-			if (console_wants("error", msg)) f_error("%c" + hora + " ERROR: " + String(msg), "color:red");
+			if (console_wants("error", msg)) call_log_function(f_error, "%c" + hora + " ERROR: " + String(msg), "color:red");
 		} else {
 			if (console_wants("error", msg)) _console.error("%c" + hora + " ERROR: " + String(msg), "color:red");
-			f_error(`${hora} ERROR: ${String(msg)}`);
+			call_log_function(f_error, `${hora} ERROR: ${String(msg)}`);
 		}
 	}
 	emit_log_callback("error", msg, hora);
@@ -3338,10 +3363,10 @@ function log_warning(format, ...args) {
 	let hora = current_timestamp();
 	if (f_warning) {
 		if (f_warning === _console.warn) {
-			if (console_wants("warning", msg)) f_warning("%c" + hora + " WARNING: " + String(msg), "color:yellow");
+			if (console_wants("warning", msg)) call_log_function(f_warning, "%c" + hora + " WARNING: " + String(msg), "color:yellow");
 		} else {
 			if (console_wants("warning", msg)) _console.warn("%c" + hora + " WARNING: " + String(msg), "color:yellow");
-			f_warning(`${hora} WARNING: ${String(msg)}`);
+			call_log_function(f_warning, `${hora} WARNING: ${String(msg)}`);
 		}
 	}
 	emit_log_callback("warning", msg, hora);
@@ -3350,7 +3375,7 @@ function log_info(format, ...args) {
 	let msg = format_log(format, ...args);
 	let hora = current_timestamp();
 	if (f_info) {
-		if (console_wants("info", msg)) f_info("%c" + hora + " INFO: " + String(msg), "color:cyan");
+		if (console_wants("info", msg)) call_log_function(f_info, "%c" + hora + " INFO: " + String(msg), "color:cyan");
 	}
 	emit_log_callback("info", msg, hora);
 }
@@ -3358,7 +3383,7 @@ function log_debug(format, ...args) {
 	let msg = format_log(format, ...args);
 	let hora = current_timestamp();
 	if (f_debug) {
-		if (console_wants("debug", msg)) f_debug("%c" + hora + " DEBUG: " + String(msg), "color:silver");
+		if (console_wants("debug", msg)) call_log_function(f_debug, "%c" + hora + " DEBUG: " + String(msg), "color:silver");
 	}
 	emit_log_callback("debug", msg, hora);
 }
@@ -3366,14 +3391,14 @@ function trace_msg(format, ...args) {
 	let msg = format_log(format, ...args);
 	let hora = current_timestamp();
 	if (f_debug) {
-		if (console_wants("msg", msg)) f_debug("%c" + hora + " MSG: " + String(msg), "color:cyan");
+		if (console_wants("msg", msg)) call_log_function(f_debug, "%c" + hora + " MSG: " + String(msg), "color:cyan");
 	}
 	emit_log_callback("msg", msg, hora);
 }
 function trace_json(jn, msg) {
 	if (console_wants("json", msg)) {
-		if (msg) _console.warn("=====> " + msg);
-		_console.dir(jn);
+		if (msg) call_log_function(_console.warn, "=====> " + log_string(msg));
+		call_log_function(_console.dir, jn);
 	}
 	emit_log_callback("json", jn, current_timestamp());
 }
@@ -4372,6 +4397,13 @@ function kw_get_dict(gobj, kw, path, default_value, flag) {
 			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);
@@ -4436,6 +4468,13 @@ function kw_get_list(gobj, kw, path, default_value, flag) {
 			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);
@@ -4649,8 +4688,8 @@ Keys:
 ["$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`);
@@ -4677,8 +4716,8 @@ Keys:
 ["$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 = {};