@yuneta/gobj-js 7.26.9 → 7.26.11

package/dist/gobj-js.umd.js

@@ -4442,6 +4442,10 @@
 			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++) {
@@ -5231,7 +5235,7 @@
 		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), kw_flag_t.KW_CREATE);
+			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;
@@ -5259,19 +5263,31 @@
 		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, [], kw_flag_t.KW_CREATE);
+			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)) 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, [], 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);
+		if (!v || ids.length !== 0) {
+			log_error(`jdb_update: path not found in topic '${topic_name}': '${path}'`);
+			return null;
+		}
+		let list;
+		if (is_array(v)) list = v;
+		else if (v["id"] === kw["id"]) {
+			json_object_update(v, kw);
+			return topic;
+		} else {
+			list = kw_get_dict_value(null, v, jdb.hook, null, 0);
+			if (list === null || list === void 0) {
+				list = [];
+				json_object_set(v, jdb.hook, list);
+			} else if (!is_array(list)) {
+				log_error(`jdb_update: the hook '${jdb.hook}' of '${path}' is not a list in topic '${topic_name}'`);
+				return null;
 			}
 		}
+		let found = _jdb_get(list, jdb.hook, kw["id"], false);
+		if (found) json_object_update(found, kw);
+		else list.push(kw);
 		return topic;
 	}
 	/********************************************
@@ -5300,29 +5316,30 @@
 			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);