@yuneta/gobj-js 7.10.0 → 7.12.0

package/dist/gobj-js.cjs.js

@@ -87,9 +87,7 @@ function sprintf_format(parse_tree, argv) {
 			case "x":
 				arg = (parseInt(arg, 10) >>> 0).toString(16);
 				break;
-			case "X":
-				arg = (parseInt(arg, 10) >>> 0).toString(16).toUpperCase();
-				break;
+			case "X": arg = (parseInt(arg, 10) >>> 0).toString(16).toUpperCase();
 		}
 		if (re.json.test(ph.type)) output += arg;
 		else {
@@ -777,9 +775,7 @@ function set_default(gobj, sdata, it) {
 			}
 			else jn_value = svalue;
 			break;
-		case data_type_t.DTP_POINTER:
-			jn_value = svalue;
-			break;
+		case data_type_t.DTP_POINTER: jn_value = svalue;
 	}
 	if (jn_value === void 0) {
 		log_error(`default_value WRONG, it: ${it.name}, value: ${it.default_value}`);
@@ -849,9 +845,7 @@ function json2item(gobj, sdata, it, jn_value_) {
 				return -1;
 			}
 			break;
-		case data_type_t.DTP_POINTER:
-			jn_value2 = jn_value_;
-			break;
+		case data_type_t.DTP_POINTER: jn_value2 = jn_value_;
 	}
 	if (jn_value2 === void 0) log_error(`${gobj_short_name(gobj)}: attr undefined: ${it.name}`);
 	sdata[it.name] = jn_value2;
@@ -1130,6 +1124,7 @@ function gclass_find_by_name(gclass_name, verbose) {
 	} catch (e) {}
 	if (!gclass) {
 		if (verbose) log_error(`gclass not found: ${gclass_name}`);
+		return null;
 	}
 	return gclass;
 }
@@ -1154,8 +1149,8 @@ function gobj_default_service() {
 function gobj_find_service(service_name, verbose) {
 	service_name = service_name.toLowerCase();
 	let service_gobj = __jn_services__[service_name];
-	if (!service_gobj && verbose) {
-		log_error(`gobj service not found: ${service_name}`);
+	if (!service_gobj) {
+		if (verbose) log_error(`gobj service not found: ${service_name}`);
 		return null;
 	}
 	return service_gobj;
@@ -1571,12 +1566,14 @@ function gobj_play(gobj) {
 		log_error(`${gobj_short_name(gobj)}: GObj DISABLED`);
 		return -1;
 	}
-	if (!gobj_is_running(gobj)) if (!(gobj.gclass.gclass_flag & gclass_flag_t.gcflag_required_start_to_play)) {
-		log_warning(`${gobj_short_name(gobj)}: GObj playing without previous start`);
-		gobj_start(gobj);
-	} else {
-		log_error(`${gobj_short_name(gobj)}: Cannot play, start not done`);
-		return -1;
+	if (!gobj_is_running(gobj)) {
+		if (!(gobj.gclass.gclass_flag & gclass_flag_t.gcflag_required_start_to_play)) {
+			log_warning(`${gobj_short_name(gobj)}: GObj playing without previous start`);
+			gobj_start(gobj);
+		} else {
+			log_error(`${gobj_short_name(gobj)}: Cannot play, start not done`);
+			return -1;
+		}
 	}
 	if (__trace_gobj_start_stop__(gobj)) trace_machine(sprintf("⏯ ⏯ play: %s", gobj_full_name(gobj)));
 	gobj.playing = true;
@@ -2681,7 +2678,7 @@ function gobj_subscribe_event(publisher, event, kw, subscriber) {
 		log_error(`subscriber NULL: ev ${event}`);
 		return 0;
 	}
-	const IGNORED_KEYS = new Set([
+	const IGNORED_KEYS = /* @__PURE__ */ new Set([
 		"__config__",
 		"__global__",
 		"__local__",
@@ -2737,7 +2734,7 @@ function gobj_unsubscribe_event(publisher, event, kw, subscriber) {
 		log_error(`subscriber NULL: ev ${event}`);
 		return 0;
 	}
-	const IGNORED_KEYS = new Set([
+	const IGNORED_KEYS = /* @__PURE__ */ new Set([
 		"__config__",
 		"__global__",
 		"__local__",
@@ -2931,9 +2928,10 @@ function gobj_command(gobj, command, kw, src) {
 		if (tracea > 1) trace_json(kw);
 	}
 	if (gobj.gclass.gmt.mt_command_parser) return gobj.gclass.gmt.mt_command_parser(gobj, command, kw, src);
-	if (gobj.gclass.command_table) if (__global_command_parser_fn__) return __global_command_parser_fn__(gobj, command, kw, src);
-	else return build_command_response(gobj, -1, sprintf("%s: global command parser not available", gobj_short_name(gobj)), 0, 0);
-	else return build_command_response(gobj, -1, sprintf("%s: command table not available", gobj_short_name(gobj)), 0, 0);
+	if (gobj.gclass.command_table) {
+		if (__global_command_parser_fn__) return __global_command_parser_fn__(gobj, command, kw, src);
+		else return build_command_response(gobj, -1, sprintf("%s: global command parser not available", gobj_short_name(gobj)), 0, 0);
+	} else return build_command_response(gobj, -1, sprintf("%s: command table not available", gobj_short_name(gobj)), 0, 0);
 }
 /************************************************************
 *  Exec gobj stats. Return a webix
@@ -3040,22 +3038,26 @@ function format_log(format) {
 function log_error(format) {
 	let msg = format_log(format);
 	let hora = current_timestamp();
-	if (f_error) if (f_error === _console.error) {
-		if (__console_output_enabled__) f_error("%c" + hora + " ERROR: " + String(msg), "color:red");
-	} else {
-		if (__console_output_enabled__) _console.error("%c" + hora + " ERROR: " + String(msg), "color:red");
-		f_error(`${hora} ERROR: ${String(msg)}`);
+	if (f_error) {
+		if (f_error === _console.error) {
+			if (__console_output_enabled__) f_error("%c" + hora + " ERROR: " + String(msg), "color:red");
+		} else {
+			if (__console_output_enabled__) _console.error("%c" + hora + " ERROR: " + String(msg), "color:red");
+			f_error(`${hora} ERROR: ${String(msg)}`);
+		}
 	}
 	emit_log_callback("error", msg, hora);
 }
 function log_warning(format) {
 	let msg = format_log(format);
 	let hora = current_timestamp();
-	if (f_warning) if (f_warning === _console.warn) {
-		if (__console_output_enabled__) f_warning("%c" + hora + " WARNING: " + String(msg), "color:yellow");
-	} else {
-		if (__console_output_enabled__) _console.warn("%c" + hora + " WARNING: " + String(msg), "color:yellow");
-		f_warning(`${hora} WARNING: ${String(msg)}`);
+	if (f_warning) {
+		if (f_warning === _console.warn) {
+			if (__console_output_enabled__) f_warning("%c" + hora + " WARNING: " + String(msg), "color:yellow");
+		} else {
+			if (__console_output_enabled__) _console.warn("%c" + hora + " WARNING: " + String(msg), "color:yellow");
+			f_warning(`${hora} WARNING: ${String(msg)}`);
+		}
 	}
 	emit_log_callback("warning", msg, hora);
 }
@@ -4091,10 +4093,12 @@ function list2options(list, field_id, field_value) {
 				vv["id"] = field_id;
 				vv["value"] = v[field_id];
 			} else {
-				if (!kw_has_key(v, field_value)) if (json_size(v) > 0) field_value = Object.keys(v)[0];
-				else {
-					log_error("list2options(): object without field value: " + field_value);
-					continue;
+				if (!kw_has_key(v, field_value)) {
+					if (json_size(v) > 0) field_value = Object.keys(v)[0];
+					else {
+						log_error("list2options(): object without field value: " + field_value);
+						continue;
+					}
 				}
 				vv["id"] = v[field_id];
 				vv["value"] = v[field_value];
@@ -4410,13 +4414,15 @@ function jdb_update(jdb, topic_name, path, kw) {
 		if (is_object(v)) v = kw_get_dict_value(null, v, jdb.hook, [], 1);
 		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"]) Object.assign(v, kw);
-	else {
-		let v_ = kw_get_dict_value(null, v, jdb.hook, [], 1);
-		let v__ = _jdb_get(v_, jdb.hook, kw["id"], false);
-		if (v__) Object.assign(v__, kw);
-		else v_.push(kw);
+	if (ids.length === 0 && v) {
+		if (is_array(v)) v.push(kw);
+		else if (v["id"] === kw["id"]) Object.assign(v, kw);
+		else {
+			let v_ = kw_get_dict_value(null, v, jdb.hook, [], 1);
+			let v__ = _jdb_get(v_, jdb.hook, kw["id"], false);
+			if (v__) Object.assign(v__, kw);
+			else v_.push(kw);
+		}
 	}
 	return topic;
 }
@@ -4442,13 +4448,15 @@ 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 (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);
+		}
 	}
 	return topic;
 }
@@ -5175,41 +5183,42 @@ function treedb_hook_data_size(value) {
 *      }
 ************************************************************/
 function treedb_decoder_fkey(col, fkey) {
-	if (is_string(fkey)) if (fkey.indexOf("^") === -1) {
-		let fkey_desc = col.fkey;
-		if (json_object_size(fkey_desc) !== 1) {
-			log_error("bad fkey 1");
-			log_error(col);
-			log_error(fkey);
-			return null;
-		}
-		let topic_name;
-		let hook_name;
-		for (const k of Object.keys(fkey_desc)) {
-			topic_name = k;
-			hook_name = fkey_desc[k];
-			break;
-		}
-		return {
-			topic_name,
-			id: fkey,
-			hook_name
-		};
-	} else {
-		let tt = fkey.split("^");
-		if (tt.length !== 3) {
-			log_error("bad fkey 2");
-			log_error(col);
-			log_error(fkey);
-			return null;
+	if (is_string(fkey)) {
+		if (fkey.indexOf("^") === -1) {
+			let fkey_desc = col.fkey;
+			if (json_object_size(fkey_desc) !== 1) {
+				log_error("bad fkey 1");
+				log_error(col);
+				log_error(fkey);
+				return null;
+			}
+			let topic_name;
+			let hook_name;
+			for (const k of Object.keys(fkey_desc)) {
+				topic_name = k;
+				hook_name = fkey_desc[k];
+				break;
+			}
+			return {
+				topic_name,
+				id: fkey,
+				hook_name
+			};
+		} else {
+			let tt = fkey.split("^");
+			if (tt.length !== 3) {
+				log_error("bad fkey 2");
+				log_error(col);
+				log_error(fkey);
+				return null;
+			}
+			return {
+				topic_name: tt[0],
+				id: tt[1],
+				hook_name: tt[2]
+			};
 		}
-		return {
-			topic_name: tt[0],
-			id: tt[1],
-			hook_name: tt[2]
-		};
-	}
-	else if (is_object(fkey)) return {
+	} else if (is_object(fkey)) return {
 		topic_name: fkey.topic_name,
 		id: fkey.id,
 		hook_name: fkey.hook_name
@@ -5251,38 +5260,39 @@ function treedb_encoder_fkey(col, fkey) {
 *      }
 ********************************************/
 function treedb_decoder_hook(col, hook) {
-	if (is_string(hook)) if (hook.indexOf("^") === -1) {
-		let hook_desc = col.hook;
-		if (json_object_size(hook_desc) !== 1) {
-			log_error("bad hook 1");
-			log_error(col);
-			log_error(hook);
-			return null;
-		}
-		let topic_name;
-		for (let k of Object.keys(hook_desc)) {
-			topic_name = k;
-			hook_desc[k];
-			break;
-		}
-		return {
-			topic_name,
-			id: hook
-		};
-	} else {
-		let tt = hook.split("^");
-		if (tt.length !== 2) {
-			log_error("bad hook 2");
-			log_error(col);
-			log_error(hook);
-			return null;
+	if (is_string(hook)) {
+		if (hook.indexOf("^") === -1) {
+			let hook_desc = col.hook;
+			if (json_object_size(hook_desc) !== 1) {
+				log_error("bad hook 1");
+				log_error(col);
+				log_error(hook);
+				return null;
+			}
+			let topic_name;
+			for (let k of Object.keys(hook_desc)) {
+				topic_name = k;
+				hook_desc[k];
+				break;
+			}
+			return {
+				topic_name,
+				id: hook
+			};
+		} else {
+			let tt = hook.split("^");
+			if (tt.length !== 2) {
+				log_error("bad hook 2");
+				log_error(col);
+				log_error(hook);
+				return null;
+			}
+			return {
+				topic_name: tt[0],
+				id: tt[1]
+			};
 		}
-		return {
-			topic_name: tt[0],
-			id: tt[1]
-		};
-	}
-	else if (is_object(hook)) return {
+	} else if (is_object(hook)) return {
 		topic_name: hook.topic_name,
 		id: hook.id
 	};
@@ -5388,9 +5398,7 @@ function treedb_get_field_desc(col) {
 				case "template":
 					field_desc.enum_list = col.template;
 					break;
-				case "table":
-					field_desc.enum_list = col.table;
-					break;
+				case "table": field_desc.enum_list = col.table;
 			}
 			field_desc.type = f;
 		} else if (str_in_list(treedb_field_attributes, f)) switch (f) {
@@ -5403,9 +5411,7 @@ function treedb_get_field_desc(col) {
 			case "required":
 				field_desc.is_required = true;
 				break;
-			case "hidden":
-				field_desc.is_hidden = true;
-				break;
+			case "hidden": field_desc.is_hidden = true;
 		}
 	}
 	return field_desc;
@@ -5442,9 +5448,7 @@ function template_get_field_desc(key, value) {
 				case "required":
 					field_desc.is_required = true;
 					break;
-				case "hidden":
-					field_desc.is_hidden = true;
-					break;
+				case "hidden": field_desc.is_hidden = true;
 			}
 		}
 		if (!field_desc.real_type) field_desc.real_type = "string";
@@ -5468,7 +5472,8 @@ function create_template_record(template, kw) {
 	Object.entries(template).forEach(([field, col]) => {
 		let default_value;
 		if (is_object(col)) default_value = col.default;
-		new_record[field] = kw_get_dict_value(null, kw, field, default_value);
+		let value = kw_get_dict_value(null, kw, field, default_value);
+		new_record[field] = value;
 	});
 	return new_record;
 }
@@ -5549,7 +5554,6 @@ function mt_writing$2(gobj, path) {
 			if (priv.msec > 0) {
 				if (!gobj_is_running(gobj)) gobj_start(gobj);
 			} else if (gobj_is_running(gobj)) gobj_stop(gobj);
-			break;
 	}
 }
 /***************************************************************
@@ -5908,9 +5912,7 @@ function mt_writing(gobj, path) {
 		case "remote_yuno_role":
 			priv.remote_yuno_role = gobj_read_str_attr(gobj, "remote_yuno_role");
 			break;
-		case "remote_yuno_service":
-			priv.remote_yuno_service = gobj_read_str_attr(gobj, "remote_yuno_service");
-			break;
+		case "remote_yuno_service": priv.remote_yuno_service = gobj_read_str_attr(gobj, "remote_yuno_service");
 	}
 }
 /***************************************************************
@@ -6452,12 +6454,13 @@ function ac_on_message(gobj, event, kw, src) {
 		return 0;
 	}
 	let gobj_service = gobj_find_service(iev_dst_service, true);
-	if (gobj_service) if (gobj_has_event(gobj_service, iev_event, event_flag_t.EVF_PUBLIC_EVENT)) gobj_send_event(gobj_service, iev_event, iev_kw, gobj);
-	else {
-		log_error(`${gobj_short_name(gobj)}: Service found but no event or not public, service '${gobj_short_name(gobj_service)}', ev '${iev_event}'`);
-		return -1;
-	}
-	else if (gobj_is_pure_child(gobj)) gobj_send_event(gobj_parent(gobj), iev_event, iev_kw, gobj);
+	if (gobj_service) {
+		if (gobj_has_event(gobj_service, iev_event, event_flag_t.EVF_PUBLIC_EVENT)) gobj_send_event(gobj_service, iev_event, iev_kw, gobj);
+		else {
+			log_error(`${gobj_short_name(gobj)}: Service found but no event or not public, service '${gobj_short_name(gobj_service)}', ev '${iev_event}'`);
+			return -1;
+		}
+	} else if (gobj_is_pure_child(gobj)) gobj_send_event(gobj_parent(gobj), iev_event, iev_kw, gobj);
 	else gobj_publish_event(gobj, iev_event, iev_kw);
 	return 0;
 }