Move property setter, changer and getter to BlockDefinition

manuq · manuq · commit d3a1599ffd96 · 2025-06-06T15:46:05.000-03:00
Create three constructor functions and use them from the catalog.
diff --git a/addons/block_code/code_generation/block_definition.gd b/addons/block_code/code_generation/block_definition.gd
@@ -194,3 +194,46 @@ static func _parse_parameter_format(parameter_format: String) -> Dictionary:
 
 static func has_category(block_definition, category: String) -> bool:
 	return block_definition.category == category
+
+
+static func new_property_setter(_class_name: String, property: Dictionary, category: String, default_value: Variant) -> Resource:
+	var type_string: String = Types.VARIANT_TYPE_TO_STRING[property.type]
+	return new(
+		&"%s_set_%s" % [_class_name, property.name],
+		_class_name,
+		"Set the %s property" % property.name,
+		category,
+		Types.BlockType.STATEMENT,
+		TYPE_NIL,
+		"set %s to {value: %s}" % [property.name.capitalize().to_lower(), type_string],
+		"%s = {value}" % property.name,
+		{"value": default_value},
+	)
+
+
+static func new_property_changer(_class_name: String, property: Dictionary, category: String, default_value: Variant) -> Resource:
+	var type_string: String = Types.VARIANT_TYPE_TO_STRING[property.type]
+	return new(
+		&"%s_change_%s" % [_class_name, property.name],
+		_class_name,
+		"Change the %s property" % property.name,
+		category,
+		Types.BlockType.STATEMENT,
+		TYPE_NIL,
+		"change %s by {value: %s}" % [property.name.capitalize().to_lower(), type_string],
+		"%s += {value}" % property.name,
+		{"value": default_value},
+	)
+
+
+static func new_property_getter(_class_name: String, property: Dictionary, category: String) -> Resource:
+	return new(
+		&"%s_get_%s" % [_class_name, property.name],
+		_class_name,
+		"The %s property" % property.name,
+		category,
+		Types.BlockType.VALUE,
+		property.type,
+		"%s" % property.name.capitalize().to_lower(),
+		"%s" % property.name,
+	)
diff --git a/addons/block_code/code_generation/blocks_catalog.gd b/addons/block_code/code_generation/blocks_catalog.gd
@@ -132,54 +132,18 @@ static func _add_property_definitions(_class_name: String, property_list: Array[
 		# Setter
 		var block_definition: BlockDefinition
 		if block_settings.get("has_setter", true):
-			block_definition = (
-				BlockDefinition
-				. new(
-					&"%s_set_%s" % [_class_name, property.name],
-					_class_name,
-					"Set the %s property" % property.name,
-					block_settings.category,
-					Types.BlockType.STATEMENT,
-					TYPE_NIL,
-					"set %s to {value: %s}" % [property.name.capitalize().to_lower(), type_string],
-					"%s = {value}" % property.name,
-					{"value": block_settings.get("default_set", _FALLBACK_SET_FOR_TYPE[property.type])},
-				)
-			)
+			var default_value: Variant = block_settings.get("default_set", _FALLBACK_SET_FOR_TYPE[property.type])
+			block_definition = BlockDefinition.new_property_setter(_class_name, property, block_settings.category, default_value)
 			_catalog[block_definition.name] = block_definition
 
 		# Changer
 		if block_settings.get("has_change", true):
-			block_definition = (
-				BlockDefinition
-				. new(
-					&"%s_change_%s" % [_class_name, property.name],
-					_class_name,
-					"Change the %s property" % property.name,
-					block_settings.category,
-					Types.BlockType.STATEMENT,
-					TYPE_NIL,
-					"change %s by {value: %s}" % [property.name.capitalize().to_lower(), type_string],
-					"%s += {value}" % property.name,
-					{"value": block_settings.get("default_change", _FALLBACK_CHANGE_FOR_TYPE[property.type])},
-				)
-			)
+			var default_value: Variant = block_settings.get("default_change", _FALLBACK_CHANGE_FOR_TYPE[property.type])
+			block_definition = BlockDefinition.new_property_changer(_class_name, property, block_settings.category, default_value)
 			_catalog[block_definition.name] = block_definition
 
 		# Getter
-		block_definition = (
-			BlockDefinition
-			. new(
-				&"%s_get_%s" % [_class_name, property.name],
-				_class_name,
-				"The %s property" % property.name,
-				block_settings.category,
-				Types.BlockType.VALUE,
-				property.type,
-				"%s" % property.name.capitalize().to_lower(),
-				"%s" % property.name,
-			)
-		)
+		block_definition = BlockDefinition.new_property_getter(_class_name, property, block_settings.category)
 		_catalog[block_definition.name] = block_definition
 
 
