BlocksCatalog: Include base blocks in get_inherited_blocks

Instead of getting specific blocks we know to have target_node_class "",
change BlocksCatalog to include those blocks in the return value from
get_inherited_blocks. This is possible due to the newly simplified
implementation of _get_blocks_by_class.

With this change, we can completely remove the list of default block
definition names from BlockScriptSerialization.

Author: dylanmccall

addons/block_code/code_generation/blocks_catalog.gd

@@ -224,14 +224,9 @@ static func has_block(block_name: StringName):
 	return block_name in _catalog
 
 
-static func get_blocks_by_class(_class_name: String) -> Array[BlockDefinition]:
+static func _get_blocks_by_class(_class_name: String) -> Array[BlockDefinition]:
 	var result: Array[BlockDefinition]
-
-	if not _class_name:
-		return result
-
 	result.assign(_catalog.values().filter(_block_definition_has_class_name.bind(_class_name)))
-
 	return result
 
 
@@ -263,7 +258,9 @@ static func _get_custom_parent_class_name(_custom_class_name: String) -> String:
 static func _get_parents(_class_name: String) -> Array[String]:
 	if ClassDB.class_exists(_class_name):
 		return _get_builtin_parents(_class_name)
-	var parents: Array[String] = [_class_name]
+	var parents: Array[String] = []
+	if _class_name != "":
+		parents.append(_class_name)
 	var _parent_class_name = _get_custom_parent_class_name(_class_name)
 	parents.append_array(_get_builtin_parents(_parent_class_name))
 	return parents
@@ -274,7 +271,8 @@ static func get_inherited_blocks(_class_name: String) -> Array[BlockDefinition]:
 
 	var definitions: Array[BlockDefinition] = []
 	for _parent_class_name in _get_parents(_class_name):
-		definitions.append_array(get_blocks_by_class(_parent_class_name))
+		definitions.append_array(_get_blocks_by_class(_parent_class_name))
+	definitions.append_array(_get_blocks_by_class(""))
 	return definitions
 
 

addons/block_code/serialization/block_script_serialization.gd

@@ -135,7 +135,6 @@ func _get_parameter_block_definition(block_name: String, parameter_name: String)
 
 func _update_block_definitions():
 	_available_blocks.clear()
-	_available_blocks.append_array(_get_default_block_definitions())
 	_available_blocks.append_array(_get_inherited_block_definitions())
 	_available_blocks.append_array(_get_variable_block_definitions())
 
@@ -176,64 +175,6 @@ func load_object_script() -> Object:
 	return null
 
 
-func _get_default_block_definitions() -> Array[BlockDefinition]:
-	var block: BlockDefinition
-	var block_list: Array[BlockDefinition] = []
-
-	# Lifecycle
-	for block_name in [&"ready", &"process", &"physics_process", &"queue_free"]:
-		block = BlocksCatalog.get_block(block_name)
-		block_list.append(block)
-
-	# Loops
-	for block_name in [&"for", &"while", &"break", &"continue", &"await_scene_ready"]:
-		block = BlocksCatalog.get_block(block_name)
-		block_list.append(block)
-
-	# Logs
-	block = BlocksCatalog.get_block(&"print")
-	block_list.append(block)
-
-	# Communication
-	for block_name in [&"define_method", &"call_method_group", &"call_method_node"]:
-		block = BlocksCatalog.get_block(block_name)
-		block_list.append(block)
-
-	for block_name in [&"add_to_group", &"add_node_to_group", &"remove_from_group", &"remove_node_from_group", &"is_in_group", &"is_node_in_group"]:
-		block = BlocksCatalog.get_block(block_name)
-		block_list.append(block)
-
-	# Variables
-	block = BlocksCatalog.get_block(&"vector2")
-	block_list.append(block)
-
-	# Math
-	for block_name in [&"add", &"subtract", &"multiply", &"divide", &"pow", &"randf_range", &"randi_range", &"sin", &"cos", &"tan"]:
-		block = BlocksCatalog.get_block(block_name)
-		block_list.append(block)
-
-	# Logic
-	for block_name in [&"if", &"else_if", &"else", &"compare", &"and", &"or", &"not"]:
-		block = BlocksCatalog.get_block(block_name)
-		block_list.append(block)
-
-	# Input
-	block = BlocksCatalog.get_block(&"is_input_actioned")
-	block_list.append(block)
-
-	# Sounds
-	for block_name in [&"load_sound", &"play_sound", &"pause_continue_sound", &"stop_sound"]:
-		block = BlocksCatalog.get_block(block_name)
-		block_list.append(block)
-
-	# Graphics
-	for block_name in [&"viewport_width", &"viewport_height", &"viewport_center"]:
-		block = BlocksCatalog.get_block(block_name)
-		block_list.append(block)
-
-	return block_list
-
-
 func _get_inherited_block_definitions() -> Array[BlockDefinition]:
 	return BlocksCatalog.get_inherited_blocks(script_inherits)
 

tests/test_category_factory.gd

@@ -8,13 +8,19 @@ const BlocksCatalog = preload("res://addons/block_code/code_generation/blocks_ca
 var block_script: BlockScriptSerialization
 
 
+func assert_set_eq(set_a: Array, set_b: Array, text: String = ""):
+	var set_a_sorted := set_a.duplicate()
+	var set_b_sorted := set_b.duplicate()
+	set_a_sorted.sort()
+	set_b_sorted.sort()
+	assert_eq(set_a_sorted, set_b_sorted, text)
+
+
 func get_category_names(categories: Array[BlockCategory]) -> Array[String]:
-	var categories_sorted: Array[BlockCategory]
-	categories_sorted.assign(categories)
-	categories_sorted.sort_custom(BlockCategory.sort_by_order)
-	var result: Array[String]
-	result.assign(categories_sorted.map(func(category): return category.name))
-	return result
+	var category_names: Array[String]
+	category_names.assign(categories.map(func(category): return category.name))
+	category_names.sort()
+	return category_names
 
 
 func get_class_category_names(_class_name: String) -> Array[String]:
@@ -28,27 +34,27 @@ func before_each():
 	block_script.initialize()
 
 
+const default_category_names = [
+	"Communication | Groups",
+	"Communication | Methods",
+	"Graphics | Viewport",
+	"Input",
+	"Lifecycle",
+	"Log",
+	"Logic | Boolean",
+	"Logic | Comparison",
+	"Logic | Conditionals",
+	"Loops",
+	"Math",
+	"Sounds",
+	"Variables",
+]
+
+
 func test_general_category_names():
 	var blocks: Array[BlockDefinition] = block_script.get_available_blocks()
 	var names: Array[String] = get_category_names(block_script.get_available_categories())
-	assert_eq(
-		names,
-		[
-			"Lifecycle",
-			"Graphics | Viewport",
-			"Sounds",
-			"Input",
-			"Communication | Methods",
-			"Communication | Groups",
-			"Loops",
-			"Logic | Conditionals",
-			"Logic | Comparison",
-			"Logic | Boolean",
-			"Variables",
-			"Math",
-			"Log",
-		]
-	)
+	assert_set_eq(names, default_category_names)
 
 
 const class_category_names = [
@@ -60,7 +66,7 @@ const class_category_names = [
 
 
 func test_inherited_category_names(params = use_parameters(class_category_names)):
-	assert_eq(get_class_category_names(params[0]), params[1])
+	assert_set_eq(get_class_category_names(params[0]), default_category_names + params[1])
 
 
 func test_unique_block_names():