@yuneta/gobj-js 7.26.10 → 7.26.12

package/dist/gobj-js.umd.js

@@ -5249,37 +5249,48 @@
 			log_error("jdb_update: topic not found: " + topic_name);
 			return null;
 		}
-		if (empty_string(kw["id"])) {
-			log_error("jdb_update: record without id: " + kw);
-			trace_msg(kw);
+		if (!is_object(kw) || empty_string(kw["id"])) {
+			log_error(`jdb_update: record without id: ${JSON.stringify(kw)}`);
 			return null;
 		}
 		if (!is_string(path)) {
 			log_error(`jdb_update: path must be a string: ${String(path)}`);
 			return null;
 		}
+		if (path !== "" && path.split("`").includes("")) {
+			log_error(`jdb_update: empty segment in path: '${path}'`);
+			return null;
+		}
 		let ids = path.split("`");
 		let id;
 		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 (!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, [], 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);
+		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;
 	}
 	/********************************************
@@ -5291,15 +5302,18 @@
 			log_error("jdb_delete: topic not found: " + topic_name);
 			return null;
 		}
-		if (empty_string(kw["id"])) {
-			log_error("jdb_delete: record without id: " + kw);
-			trace_msg(kw);
+		if (!is_object(kw) || empty_string(kw["id"])) {
+			log_error(`jdb_delete: record without id: ${JSON.stringify(kw)}`);
 			return null;
 		}
 		if (!is_string(path)) {
 			log_error(`jdb_delete: path must be a string: ${String(path)}`);
 			return null;
 		}
+		if (path !== "" && path.split("`").includes("")) {
+			log_error(`jdb_delete: empty segment in path: '${path}'`);
+			return null;
+		}
 		let ids = path.split("`");
 		let id;
 		let v = topic;