@yuneta/gobj-js 7.26.8 → 7.26.10

package/dist/gobj-js.cjs.js

@@ -4439,6 +4439,10 @@ function kw_set_dict_value(gobj, kw, path, value) {
 		log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}kw_set_dict_value(): path must be a string: ${String(path)}`);
 		return -1;
 	}
+	if (path === "") {
+		log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}kw_set_dict_value(): path empty`);
+		return -1;
+	}
 	let ss = path.split("`");
 	let len = ss.length;
 	for (let i = 0; i < len; i++) {
@@ -4465,6 +4469,26 @@ function kw_set_dict_value(gobj, kw, path, value) {
 	return 0;
 }
 /************************************************************
+*  Whether walking `path` meets a value that is neither a dict nor
+*  a list BEFORE its last segment: kw_find_path() logs that one
+*  even when it is not verbose, so a writer that goes on to
+*  kw_set_dict_value() would log it a second time.
+************************************************************/
+function path_crosses_a_scalar(kw, path) {
+	let ss = path.split("`");
+	let v = kw;
+	for (let i = 0; i < ss.length - 1; i++) {
+		if (is_array(v)) {
+			const idx = list_segment_index(v, ss[i]);
+			if (idx < 0) return false;
+			v = v[idx];
+		} else v = Object.prototype.hasOwnProperty.call(v, ss[i]) ? v[ss[i]] : void 0;
+		if (v === void 0 || v === null) return false;
+		if (!(is_object(v) || is_array(v))) return true;
+	}
+	return false;
+}
+/************************************************************
 *
 ************************************************************/
 function kw_set_subdict_value(gobj, kw, path, key, value) {
@@ -4475,7 +4499,7 @@ function kw_set_subdict_value(gobj, kw, path, key, value) {
 	}
 	let subdict = kw_find_path(gobj, kw, path, false);
 	if (subdict === void 0) {
-		if (!is_string(path)) return -1;
+		if (!is_string(path) || path_crosses_a_scalar(kw, path)) return -1;
 		subdict = {};
 		if (kw_set_dict_value(gobj, kw, path, subdict) < 0) return -1;
 	}
@@ -5203,12 +5227,12 @@ jdb_init(jdb);
 ************************************************************/
 function jdb_init(jdb, prefix, duplicate) {
 	if (duplicate) jdb = json_deep_copy(jdb);
-	let type = kw_get_dict_value(null, jdb, "type", [], 1);
-	kw_get_str(null, jdb, "hook", "data", 1);
-	let schema = kw_get_dict_value(null, jdb, "schema", {}, 1);
-	let topics = kw_get_dict_value(null, jdb, "topics", {}, 1);
+	let type = kw_get_dict_value(null, jdb, "type", [], kw_flag_t.KW_CREATE);
+	kw_get_str(null, jdb, "hook", "data", kw_flag_t.KW_CREATE);
+	let schema = kw_get_dict_value(null, jdb, "schema", {}, kw_flag_t.KW_CREATE);
+	let topics = kw_get_dict_value(null, jdb, "topics", {}, kw_flag_t.KW_CREATE);
 	let walk = function(obj, key, value, full_path) {
-		if (key.substring(0, 2) !== "__") kw_get_dict_value(null, topics, full_path, json_deep_copy(type), 1);
+		if (key.substring(0, 2) !== "__" && !is_object(value)) kw_get_dict_value(null, topics, full_path, json_deep_copy(type), kw_flag_t.KW_CREATE);
 	};
 	_traverse_dict(schema, walk, prefix);
 	return jdb;
@@ -5236,14 +5260,18 @@ function jdb_update(jdb, topic_name, path, kw) {
 	let v = topic;
 	while (id = ids.shift()) {
 		if (empty_string(id) || !v) break;
-		if (is_object(v)) v = kw_get_dict_value(null, v, jdb.hook, [], 1);
+		if (is_object(v)) v = kw_get_dict_value(null, v, jdb.hook, [], kw_flag_t.KW_CREATE);
 		v = _jdb_get(v, null, id, false);
 	}
+	if (!v || ids.length !== 0) {
+		log_error(`jdb_update: path not found in topic '${topic_name}': '${path}'`);
+		return null;
+	}
 	if (ids.length === 0 && v) {
 		if (is_array(v)) v.push(kw);
 		else if (v["id"] === kw["id"]) json_object_update(v, kw);
 		else {
-			let v_ = kw_get_dict_value(null, v, jdb.hook, [], 1);
+			let v_ = kw_get_dict_value(null, v, jdb.hook, [], kw_flag_t.KW_CREATE);
 			let v__ = _jdb_get(v_, jdb.hook, kw["id"], false);
 			if (v__) json_object_update(v__, kw);
 			else v_.push(kw);
@@ -5277,29 +5305,30 @@ function jdb_delete(jdb, topic_name, path, kw) {
 		if (is_object(v)) v = kw_get_dict_value(null, v, jdb.hook, null, 0);
 		v = _jdb_get(v, null, id, false);
 	}
-	if (ids.length === 0 && v) {
-		if (is_array(v)) {
-			let idx = id_index_in_obj_list(v, kw["id"]);
-			if (idx >= 0) v.splice(idx, 1);
-		} else {
-			let v_ = kw_get_dict_value(null, v, jdb.hook, null, 0);
-			let idx = id_index_in_obj_list(v_, kw["id"]);
-			if (idx >= 0) v_.splice(idx, 1);
-		}
+	if (!v || ids.length !== 0) {
+		log_error(`jdb_delete: path not found in topic '${topic_name}': '${path}'`);
+		return null;
+	}
+	let list = is_array(v) ? v : kw_get_dict_value(null, v, jdb.hook, null, 0);
+	let idx = id_index_in_obj_list(list, kw["id"]);
+	if (idx < 0) {
+		log_error(`jdb_delete: record not found in topic '${topic_name}': '${path}' '${kw["id"]}'`);
+		return null;
 	}
+	list.splice(idx, 1);
 	return topic;
 }
 /********************************************
 *
 ********************************************/
 function jdb_get_topic(jdb, topic_name) {
-	let topics = kw_get_dict_value(null, jdb, "topics", null, 0, false);
+	let topics = kw_get_dict_value(null, jdb, "topics", null, 0);
 	if (!topics) {
 		log_error("jdb topics section not found");
 		trace_msg(jdb);
 		return null;
 	}
-	let topic = kw_get_dict_value(null, topics, topic_name, null, 0, false);
+	let topic = kw_get_dict_value(null, topics, topic_name, null, 0);
 	if (!topic) {
 		log_error("jdb topic not found: " + topic_name);
 		trace_msg(topics);