@yuneta/gobj-js 7.26.12 → 7.26.14

package/dist/gobj-js.cjs.js

@@ -4337,8 +4337,10 @@ function kw_get_pointer(gobj, kw, path, default_value, flag) {
 /************************************************************
 *  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). KW_CREATE stores a dict default, never a null one, and
+*  replaces a null at the path; over another type it logs and
+*  gives the default back unwritten (C returns NULL there, SDK
+*  7.26.9). 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) {
@@ -4359,8 +4361,12 @@ function kw_get_dict(gobj, kw, path, default_value, flag) {
 		return default_value;
 	}
 	if (!is_object(v)) {
-		if (required) {
-			log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}path MUST BE a json dict: '${path}'`);
+		if (create && v === null && is_object(default_value)) {
+			kw_set_dict_value(gobj, kw, path, default_value);
+			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);
 		}
 		return default_value;
@@ -4394,7 +4400,9 @@ function kw_get_dict_value(gobj, kw, path, default_value, flag) {
 /************************************************************
 *  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
+*  stores a list default, never a null one, and replaces a null
+*  at the path; over another type it logs and gives the default
+*  back unwritten (C returns NULL there, SDK 7.26.9). 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].
@@ -4417,8 +4425,12 @@ function kw_get_list(gobj, kw, path, default_value, flag) {
 		return default_value;
 	}
 	if (!is_array(v)) {
-		if (required) {
-			log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}path MUST BE a json list: '${path}'`);
+		if (create && v === null && is_array(default_value)) {
+			kw_set_dict_value(gobj, kw, path, default_value);
+			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);
 		}
 		return default_value;
@@ -4443,6 +4455,10 @@ function kw_set_dict_value(gobj, kw, path, value) {
 		log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}kw_set_dict_value(): path empty`);
 		return -1;
 	}
+	if (path.split("`").includes("")) {
+		log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}kw_set_dict_value(): empty segment in path: '${path}'`);
+		return -1;
+	}
 	let ss = path.split("`");
 	let len = ss.length;
 	for (let i = 0; i < len; i++) {
@@ -5238,6 +5254,17 @@ function jdb_init(jdb, prefix, duplicate) {
 	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) {
@@ -5247,7 +5274,7 @@ function jdb_update(jdb, topic_name, path, kw) {
 		return null;
 	}
 	if (!is_object(kw) || empty_string(kw["id"])) {
-		log_error(`jdb_update: record without id: ${JSON.stringify(kw)}`);
+		log_error(`jdb_update: record without id: ${safe_json_text(kw)}`);
 		return null;
 	}
 	if (!is_string(path)) {
@@ -5300,7 +5327,7 @@ function jdb_delete(jdb, topic_name, path, kw) {
 		return null;
 	}
 	if (!is_object(kw) || empty_string(kw["id"])) {
-		log_error(`jdb_delete: record without id: ${JSON.stringify(kw)}`);
+		log_error(`jdb_delete: record without id: ${safe_json_text(kw)}`);
 		return null;
 	}
 	if (!is_string(path)) {