@yuneta/gobj-js 7.26.7 → 7.26.9

package/dist/gobj-js.cjs.js

@@ -4465,6 +4465,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) {
@@ -4473,9 +4493,14 @@ function kw_set_subdict_value(gobj, kw, path, key, value) {
 		log_error("kw is not an object");
 		return -1;
 	}
-	let subdict = kw_get_dict(gobj, kw, path, {}, kw_flag_t.KW_CREATE);
+	let subdict = kw_find_path(gobj, kw, path, false);
+	if (subdict === void 0) {
+		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;
+	}
 	if (!is_object(subdict)) {
-		log_error("subdict is not an object");
+		log_error(`subdict is not an object: '${path}'`);
 		return -1;
 	}
 	set_own_key(subdict, key, value);
@@ -5198,12 +5223,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) !== "__") kw_get_dict_value(null, topics, full_path, json_deep_copy(type), kw_flag_t.KW_CREATE);
 	};
 	_traverse_dict(schema, walk, prefix);
 	return jdb;
@@ -5222,19 +5247,23 @@ function jdb_update(jdb, topic_name, path, kw) {
 		trace_msg(kw);
 		return null;
 	}
+	if (!is_string(path)) {
+		log_error(`jdb_update: path must be a string: ${String(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, [], 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 (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);
@@ -5256,6 +5285,10 @@ function jdb_delete(jdb, topic_name, path, kw) {
 		trace_msg(kw);
 		return null;
 	}
+	if (!is_string(path)) {
+		log_error(`jdb_delete: path must be a string: ${String(path)}`);
+		return null;
+	}
 	let ids = path.split("`");
 	let id;
 	let v = topic;