Improve debug info related functions

Author: NovaDC

addons/novatools/novatools.gd

@@ -716,11 +716,47 @@ static func typeof_is_any_array(type:int) -> bool:
 ## since [Script]'s enums are only defined as constant dictionaries,
 ## making it technically possible for typos of names to include dictionaries with non-[int] values.
 ## While [param enforce_values_of_int] defaults to [code]true[/code], it can be disabled for a menial speed boost when calling this method.
-static func enum_extract_dict(name_or_object:Variant, enum_name := "", enforce_values_of_int := true) -> Dictionary:
 ## This methods is indented for use with methods like [make_int_enum_hint_string] or other means handling exported enum values in the inspector.
+static func enum_extract_dict(name_or_object:Variant, enum_name := "", enforce_values_of_int := true, enforce_keys_of_stringlike := true) -> Dictionary:
 	if typeof(name_or_object) == TYPE_DICTIONARY: #how passing in a gdscript enum type should (hopefully) work
+		var typed_dicts_supported:bool = Engine.get_version_info().major >= 4 and Engine.get_version_info().minor >= 4 and name_or_object.is_typed()
+
+		var kt:int = TYPE_NIL
+		if typed_dicts_supported and name_or_object.is_typed_key():
+			kt = name_or_object.get_typed_key_builtin()
+		if enforce_keys_of_stringlike:
+			if kt != TYPE_NIL: #If the keys are variant, we should check them manually
+				assert(kt in [TYPE_STRING, TYPE_STRING_NAME]) #if they are [Variant typed], which is ok when using both stringnames and strings as keys, since they are technically distinct but equally valid enum name types
+			else:
+				# humph
+				# if you don't enforce the key types
+				# then you don't get to use my super cool type fixer
+				var key_types:Array = name_or_object.keys().map(typeof)
+				var string_key_count := key_types.count(TYPE_STRING)
+				var string_name_key_count := key_types.count(TYPE_STRING_NAME)
+				assert(string_key_count + string_name_key_count == key_types.size())
+				if string_key_count == key_types.size():
+					kt = TYPE_STRING
+				elif string_name_key_count == key_types.size():
+					kt = TYPE_STRING_NAME
+				# otherwise, just leave it variant, it's allowable (though perhaps this should change later on)
+
+		var vt:int = TYPE_NIL
+		if typed_dicts_supported and name_or_object.is_typed_value():
+			vt = name_or_object.get_typed_value_builtin()
 		if enforce_values_of_int:
-			assert(name_or_object.values().all(func (v): return typeof(v) == TYPE_INT))
+			if vt != TYPE_NIL: #If the values are variant, we should check them manually
+				assert(vt == TYPE_INT) #if they are [Variant typed]
+			else:
+				assert(name_or_object.values().all(func (v): return typeof(v) == TYPE_INT))
+				vt = TYPE_INT
+
+		if typed_dicts_supported and (kt != TYPE_NIL or vt != TYPE_NIL):
+			name_or_object = Dictionary(name_or_object, kt, "", null, vt, "", null)
+			name_or_object.make_read_only()
+		elif not name_or_object.is_read_only():
+			name_or_object = name_or_object.duplicate(false)
+			name_or_object.make_read_only()
 		return name_or_object
 	elif typeof(name_or_object) in [TYPE_STRING, TYPE_STRING_NAME, TYPE_OBJECT]:
 		assert(enum_name != "")
@@ -730,7 +766,7 @@ static func enum_extract_dict(name_or_object:Variant, enum_name := "", enforce_v
 		var cls_name:String = ""
 		# note that we don't use [get_class_name] here because we want the classdb name specifically
 		if typeof(name_or_object) in [TYPE_STRING, TYPE_STRING_NAME]:
-			cls_name = name_or_object
+			cls_name = str(name_or_object)
 		elif name_or_object is Script:
 			cls_name = get_class_name(name_or_object)
 		else:
@@ -786,7 +822,8 @@ static func make_string_suggestion_enum_hint_string(enum_dicts:Array[Variant]) -
 		assert(ks != null)
 
 		for k in ks:
-			assert(not k in ns)
+			if k in ns:
+				continue
 			assert(typeof(k) in [TYPE_STRING, TYPE_STRING_NAME])
 			ns.append(k)
 	return ",".join(ns)
@@ -803,6 +840,7 @@ static func make_int_enum_hint_string(enum_dicts:Array[Dictionary]) -> String:
 	var dc := {}
 	for d in enum_dicts:
 		for k in d.keys():
+			assert(typeof(k) in [TYPE_STRING, TYPE_STRING_NAME])
 			var v = d[k]
 			assert(v not in dc.keys())
 			dc[v] = k
@@ -950,6 +988,8 @@ enum DebugInfoTypes{
 	ENGINE_COPYRIGHT_INFO,
 	ENGINE_DONOR_INFO,
 	ENGINE_LICENCE_INFO,
+
+	DEBUG_INFO_TYPES_MAX,
 }
 
 ## Determines if the given [param enum_value] is a value compatible
@@ -971,11 +1011,12 @@ static func is_performance_monitor_id(enum_value:int) -> bool:
 ## any common values with the [enum Performance.Monitor] enum,
 ## so you are safe to use either enum's value as an id without further specification.
 static func get_debug_info(name_or_id:Variant, default:Variant = null) -> Variant:
-	if typeof(name_or_id) in [TYPE_STRING_NAME, TYPE_STRING] and Performance.has_custom_monitor(name_or_id):
-		return Performance.get_custom_monitor(name_or_id)
+	if typeof(name_or_id) in [TYPE_STRING_NAME, TYPE_STRING]:
+		if Performance.has_custom_monitor(name_or_id):
+			return Performance.get_custom_monitor(name_or_id)
 	elif typeof(name_or_id) == TYPE_INT:
 		match(name_or_id):
-			var mon when mon in enum_extract_dict("Performance", "Monitor").values():
+			var mon when is_performance_monitor_id(mon):
 				return Performance.get_monitor(mon)
 
 			DebugInfoTypes.RUN_IS_DEBUG:
@@ -1041,18 +1082,9 @@ static func get_debug_info(name_or_id:Variant, default:Variant = null) -> Varian
 			DebugInfoTypes.OS_VERSION_ALIAS_OR_NUMBER:
 				return OS.get_version_alias()
 			DebugInfoTypes.OS_BROWSER_OS:
-				if OS.has_feature("web_android"):
-					return "web_android"
-				if OS.has_feature("web_ios"):
-					return "web_ios"
-				if OS.has_feature("web_macos"):
-					return "web_macos"
-				if OS.has_feature("web_windows"):
-					return "web_windows"
-				if OS.has_feature("web_linuxbsd"):
-					return "web_linuxbsd"
-				if OS.has_feature("web"):
-					return "web"
+				for feat in ["web_android", "web_ios", "web_macos", "web_windows", "web_linuxbsd", "web"]:
+					if OS.has_feature(feat):
+						return feat
 				return null
 			DebugInfoTypes.OS_GRANTED_PERMISSIONS:
 				return OS.get_granted_permissions()
@@ -1219,10 +1251,7 @@ static func get_debug_info(name_or_id:Variant, default:Variant = null) -> Varian
 			DebugInfoTypes.XR_INTERFACE_COUNT:
 				return XRServer.get_interface_count()
 			DebugInfoTypes.XR_INTERFACE_NAMES:
-				var interfaces = []
-				for i in range(XRServer.get_interface_count()):
-					interfaces.append(XRServer.get_interface(i).get_name())
-				return interfaces
+				return range(XRServer.get_interface_count()).map(func (i): return XRServer.get_interface(i).get_name())
 
 			DebugInfoTypes.ENGINE_VERSION:
 				return Engine.get_version_info()